summaryrefslogtreecommitdiff
path: root/faad2
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /faad2
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'faad2')
-rw-r--r--faad2/faad2-2.0/Makefile.patch10
-rw-r--r--faad2/faad2-2.0/Makefile2.patch20
2 files changed, 30 insertions, 0 deletions
diff --git a/faad2/faad2-2.0/Makefile.patch b/faad2/faad2-2.0/Makefile.patch
index e69de29bb2..fec4df08ef 100644
--- a/faad2/faad2-2.0/Makefile.patch
+++ b/faad2/faad2-2.0/Makefile.patch
@@ -0,0 +1,10 @@
+--- ./Makefile.am.old 2004-09-25 21:39:22.000000000 +0930
++++ ./Makefile.am 2004-09-25 21:39:30.000000000 +0930
+@@ -2,7 +2,3 @@
+
+ EXTRA_DIST = faad2.spec
+
+-rpm: Makefile
+- make dist
+- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
+- rm $(PACKAGE)-$(VERSION).tar.gz
diff --git a/faad2/faad2-2.0/Makefile2.patch b/faad2/faad2-2.0/Makefile2.patch
index e69de29bb2..5940f9fad4 100644
--- a/faad2/faad2-2.0/Makefile2.patch
+++ b/faad2/faad2-2.0/Makefile2.patch
@@ -0,0 +1,20 @@
+--- ./Makefile.old 2004-09-25 21:53:20.000000000 +0930
++++ ./Makefile 2004-09-25 21:53:50.000000000 +0930
+@@ -108,7 +108,7 @@
+ INSTALL_DATA = ${INSTALL} -m 644
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_SCRIPT = ${INSTALL}
+-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
++INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c
+ LDFLAGS = -L/cc/build-corgi/tmp/staging/arm-linux/lib -Wl,-rpath-link,/cc/build-corgi/tmp/staging/arm-linux/lib -Wl,-rpath,/usr/lib
+ LIBOBJS =
+ LIBS =
+@@ -521,7 +521,7 @@
+ installcheck: installcheck-recursive
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG= \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic: