diff options
| author | midipix <writeonce@midipix.org> | 2017-08-08 19:46:29 -0400 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-08-08 23:52:38 +0000 |
| commit | 2d8ece07a9279e0d49e94b9d7e98d84e12b4a9a2 (patch) | |
| tree | 54f63f329a77a326a7a624c0c1ed9166efce13d7 /main | |
| parent | 8330027fc5501df4ebc5bf7e14c46c6c05e9c4db (diff) | |
| download | aports-2d8ece07a9279e0d49e94b9d7e98d84e12b4a9a2.tar.bz2 aports-2d8ece07a9279e0d49e94b9d7e98d84e12b4a9a2.tar.xz | |
added recipe.patch (do not rely on libtool's reordering of linker arguments).
Diffstat (limited to 'main')
| -rw-r--r-- | main/gettext/APKBUILD | 11 | ||||
| -rw-r--r-- | main/gettext/recipe.patch | 44 |
2 files changed, 51 insertions, 4 deletions
diff --git a/main/gettext/APKBUILD b/main/gettext/APKBUILD index 3eeeaa53e1..be5d4f5004 100644 --- a/main/gettext/APKBUILD +++ b/main/gettext/APKBUILD @@ -12,7 +12,7 @@ depends= # they depend on gettext and would introduce cyclic dependencies makedepends="perl ncurses-dev libxml2-dev libunistring-dev" source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz - fix-abi.patch" + fix-abi.patch recipe.patch" subpackages="$pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang libintl $pkgname-asprintf $pkgname-libs" _builddir="$srcdir"/$pkgname-$pkgver @@ -59,8 +59,11 @@ asprintf() { } md5sums="df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -054ee44e6dfb056efd42dc3063e273ae fix-abi.patch" +054ee44e6dfb056efd42dc3063e273ae fix-abi.patch +90c6cda28ccd918acceff6ae955882bf recipe.patch" sha256sums="105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4 gettext-0.19.8.1.tar.xz -48dff403e8966137e900186b2fbf9adaf7c3743ccc4c4d05b2b250009a0a6273 fix-abi.patch" +48dff403e8966137e900186b2fbf9adaf7c3743ccc4c4d05b2b250009a0a6273 fix-abi.patch +dc42c72e7b39e4c00e92fad0240d697fb4f037908dd0c8477a4384e7b4f8df57 recipe.patch" sha512sums="3553227b62f2a7d9b67c881ef889c030a6a21d5ecd210c4bf3d649df0b37193a99a68cf8fd5f2c69b6a87e847035dd9576f9bcb9363422866e26b04f4f6dd431 gettext-0.19.8.1.tar.xz -f517a351864bb194117e7147015db9a9b0ffbb1feb22ecf39bc1c99ad904420467e267a893c3b1a76c1adb810d1b37b1c2c1273cda861ff1d260102701bc644a fix-abi.patch" +f517a351864bb194117e7147015db9a9b0ffbb1feb22ecf39bc1c99ad904420467e267a893c3b1a76c1adb810d1b37b1c2c1273cda861ff1d260102701bc644a fix-abi.patch +aa42108ff5e679c3922a70672951c0065eea0274b7f3258639df4aa58fa6f8b2a59c123b6d6b7ad40c87134cc0f5670ccf9af025497305210994ad0d4f61bacb recipe.patch" diff --git a/main/gettext/recipe.patch b/main/gettext/recipe.patch new file mode 100644 index 0000000000..1676e40145 --- /dev/null +++ b/main/gettext/recipe.patch @@ -0,0 +1,44 @@ +--- a/gettext-tools/gnulib-lib/Makefile.am 2017-08-08 19:05:50.811322112 -0400 ++++ b/gettext-tools/gnulib-lib/Makefile.am 2017-08-08 19:06:14.887594419 -0400 +@@ -66,6 +66,8 @@ + libgettextlib_la_LDFLAGS += -os2dllname gtlib + endif + ++LIBS += $(libgettextlib_la_LDFLAGS) $(LDFLAGS) ++ + # Linking with C++ libraries is needed _only_ on mingw and Cygwin. + if !WOE32DLL + libgettextlib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +--- a/gettext-tools/gnulib-lib/Makefile.in 2017-08-08 19:05:56.971221217 -0400 ++++ b/gettext-tools/gnulib-lib/Makefile.in 2017-08-08 19:06:26.197409171 -0400 +@@ -1617,7 +1617,7 @@ + LIBOBJS = @LIBOBJS@ + LIBPTH = @LIBPTH@ + LIBPTH_PREFIX = @LIBPTH_PREFIX@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ $(libgettextlib_la_LDFLAGS) $(LDFLAGS) + LIBTERMINFO = @LIBTERMINFO@ + LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ + LIBTHREAD = @LIBTHREAD@ +--- a/gettext-tools/src/Makefile.am 2017-08-08 19:35:12.899628103 -0400 ++++ b/gettext-tools/src/Makefile.am 2017-08-08 19:34:27.067045491 -0400 +@@ -363,6 +363,8 @@ + cldr_plurals_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(pkglibdir)` + endif + ++LIBS += $(libgettextsrc_la_LDFLAGS) $(LDFLAGS) ++ + # Linking with C++ libraries is needed _only_ on mingw and Cygwin. + if !WOE32DLL + libgettextsrc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +--- a/gettext-tools/src/Makefile.in 2017-08-08 19:35:25.622753038 -0400 ++++ b/gettext-tools/src/Makefile.in 2017-08-08 19:35:33.572622822 -0400 +@@ -1687,7 +1687,7 @@ + LIBOBJS = @LIBOBJS@ + LIBPTH = @LIBPTH@ + LIBPTH_PREFIX = @LIBPTH_PREFIX@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ $(libgettextsrc_la_LDFLAGS) $(LDFLAGS) + LIBTERMINFO = @LIBTERMINFO@ + LIBTESTS_LIBDEPS = @LIBTESTS_LIBDEPS@ + LIBTHREAD = @LIBTHREAD@ |