diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2013-02-04 00:57:39 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2013-02-04 00:57:39 +0000 |
| commit | 28e1ae2900a505d897d0de776c8e62496de1e101 (patch) | |
| tree | e40302d671dd6a3ff2fa3129994ef4ea5d5d9a52 | |
| parent | 03eec861b75d930a703c3e795077023ec0bd0f84 (diff) | |
update patch to apply to 0.44 and trunk
svn path=/trunk/; revision=17022
| -rw-r--r-- | debian/patches/workaround_make_calling_configure_problem.patch | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/debian/patches/workaround_make_calling_configure_problem.patch b/debian/patches/workaround_make_calling_configure_problem.patch index d4e505e2..137be34d 100644 --- a/debian/patches/workaround_make_calling_configure_problem.patch +++ b/debian/patches/workaround_make_calling_configure_problem.patch @@ -3,15 +3,11 @@ Description: fix ./configure dying thinking we're cross-compiling ./configure somehow gets some LDFLAGS for shared libraries and uses them in the gcc tests. The executable then fails to run since its a shared library, and ./configure thinks we're cross-compiling. This patch forces no LDFLAGS. - . - pd-extended (0.43.4~20121016-1) UNRELEASED; urgency=low - . - * Initial release. Author: Hans-Christoph Steiner <hans@eds.org> --- pd-extended-0.43.4~20121016.orig/externals/Makefile +++ pd-extended-0.43.4~20121016/externals/Makefile -@@ -574,6 +574,7 @@ $(gem_src)/Gem.dll: $(gem_src)/configure +@@ -565,6 +565,7 @@ $(gem_src)/Gem.pd_linux: $(gem_src)/configure cd $(gem_src) && ./configure \ CXXFLAGS="-DHAVE_S_STUFF_H" \ @@ -19,7 +15,7 @@ Author: Hans-Christoph Steiner <hans@eds.org> --prefix=$(prefix) \ --with-video=plugins \ --with-film=plugins \ -@@ -613,7 +614,7 @@ $(externals_src)/gem2pdp/configure: $(ex +@@ -604,7 +605,7 @@ cd $(externals_src)/gem2pdp && autoconf $(externals_src)/gem2pdp/Makefile: $(externals_src)/gem2pdp/Makefile.in @@ -28,7 +24,7 @@ Author: Hans-Christoph Steiner <hans@eds.org> --with-gemdir=$(gem_src) --with-pdpdir=$(externals_src)/pdp gem2pdp: $(externals_src)/gem2pdp/configure $(externals_src)/gem2pdp/Makefile -@@ -788,7 +789,7 @@ $(IEM16_DIR)/configure: $(IEM16_DIR)/con +@@ -771,7 +772,7 @@ $(IEM16_DIR)/Make.config: $(IEM16_DIR)/Make.config.in \ $(IEM16_DIR)/configure @@ -37,7 +33,7 @@ Author: Hans-Christoph Steiner <hans@eds.org> --with-pd=$(pd_src) iem16: $(IEM16_DIR)/Make.config -@@ -1356,7 +1357,7 @@ $(externals_src)/pdp/configure: $(extern +@@ -1356,7 +1357,7 @@ cd $(externals_src)/pdp && autoconf $(externals_src)/pdp/Makefile.config: $(externals_src)/pdp/configure $(externals_src)/pdp/Makefile.config.in @@ -46,7 +42,7 @@ Author: Hans-Christoph Steiner <hans@eds.org> $(PDP_OPTIONS) $(externals_src)/pdp/pdp.$(EXTENSION): $(externals_src)/pdp/Makefile.config -@@ -1745,6 +1746,7 @@ $(zexy_src)/configure: $(zexy_src)/confi +@@ -1737,6 +1738,7 @@ $(zexy_src)/Makefile: $(zexy_src)/configure $(zexy_src)/Makefile.am $(zexy_src)/src/Makefile.am cd $(zexy_src) && ./configure --disable-library \ @@ -54,7 +50,7 @@ Author: Hans-Christoph Steiner <hans@eds.org> --with-extension=$(EXTENSION) \ --prefix=$(prefix) \ --libdir=$(objectsdir) \ ---- pd-extended-0.43.4~20121016.orig/externals/moocow/extended/Makefile (revision 16399) +--- pd-extended-0.43.4~20121016.orig/externals/moocow/extended/Makefile (revision 17019) +++ pd-extended-0.43.4~20121016.orig/externals/moocow/extended/Makefile (working copy) @@ -36,7 +36,7 @@ # CFLAGS="$(shell echo $(CFLAGS))" ##-- works |