diff options
Diffstat (limited to 'dev-libs/apr/files')
-rw-r--r-- | dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch | 35 | ||||
-rw-r--r-- | dev-libs/apr/files/apr-1.7.2-libtool.patch | 16 | ||||
-rw-r--r-- | dev-libs/apr/files/apr-1.7.2-respect-flags.patch | 22 | ||||
-rw-r--r-- | dev-libs/apr/files/apr-1.7.2-sysroot.patch | 37 |
4 files changed, 110 insertions, 0 deletions
diff --git a/dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch b/dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch new file mode 100644 index 000000000000..9b4935fe7f0a --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.2-fix-pkgconfig-libs.patch @@ -0,0 +1,35 @@ +Don't pollute Libs with internal bits like libcrypt. + +https://bugs.gentoo.org/811765 +https://sources.debian.org/patches/apr/1.7.2-2/fix-apr.pc.patch/ +https://sources.debian.org/patches/apr/1.7.2-2/omit_extra_libs.patch/ + +From: <tfheen@debian.org> +Subject: No description. + +--- a/apr.pc.in ++++ b/apr.pc.in +@@ -7,5 +7,6 @@ + Name: APR + Description: The Apache Portable Runtime library + Version: @APR_DOTTED_VERSION@ +-Libs: -L${libdir} -l@APR_LIBNAME@ @EXTRA_LIBS@ +-Cflags: @EXTRA_CPPFLAGS@ @EXTRA_CFLAGS@ -I${includedir} ++Libs: -L${libdir} -l@APR_LIBNAME@ ++Libs.private: @EXTRA_LIBS@ ++Cflags: @EXTRA_CPPFLAGS@ -I${includedir} + +From: Stefan Fritsch <sf@debian.org> +Subject: #463399 + +--- a/apr-config.in ++++ b/apr-config.in +@@ -36,7 +36,7 @@ SHELL="@SHELL@" + CPPFLAGS="@EXTRA_CPPFLAGS@" + CFLAGS="@EXTRA_CFLAGS@" + LDFLAGS="@EXTRA_LDFLAGS@" +-LIBS="@EXTRA_LIBS@" ++LIBS="" + EXTRA_INCLUDES="@EXTRA_INCLUDES@" + SHLIBPATH_VAR="@shlibpath_var@" + APR_SOURCE_DIR="@apr_srcdir@" diff --git a/dev-libs/apr/files/apr-1.7.2-libtool.patch b/dev-libs/apr/files/apr-1.7.2-libtool.patch new file mode 100644 index 000000000000..121e4374f9fc --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.2-libtool.patch @@ -0,0 +1,16 @@ +generate a local copy of libtool for use in compiling + +https://bugs.gentoo.org/374355 +--- a/configure.in ++++ b/configure.in +@@ -268,9 +268,7 @@ case $host in + fi + else + dnl libtoolize requires that the following not be indented +- dnl should become LT_INIT(win32-dll) +-AC_LIBTOOL_WIN32_DLL +-AC_PROG_LIBTOOL ++LT_INIT(win32-dll) + # get libtool's setting of shlibpath_var + if test "x$shlibpath_var" = "x"; then + eval `grep "^shlibpath_var=[[A-Z_]]*$" $apr_builddir/libtool` diff --git a/dev-libs/apr/files/apr-1.7.2-respect-flags.patch b/dev-libs/apr/files/apr-1.7.2-respect-flags.patch new file mode 100644 index 000000000000..f075fc0514d2 --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.2-respect-flags.patch @@ -0,0 +1,22 @@ +https://sources.debian.org/patches/apr/1.7.2-2/dont_override_external_buildflags/ + +# Don't force apr-using projects to use the compile flags used during +# apr's compilation. +--- a/build/apr_rules.mk.in ++++ b/build/apr_rules.mk.in +@@ -42,10 +42,10 @@ LIBTOOL=@LIBTOOL@ + # compilation and linking flags that are supposed to be set only by the user. + # configure adds to them for tests, but we restore them at the end. + # +-CFLAGS=@CFLAGS@ +-CPPFLAGS=@CPPFLAGS@ +-LDFLAGS=@LDFLAGS@ +-LIBS=@LIBS@ ++CFLAGS?=@CFLAGS@ ++CPPFLAGS?=@CPPFLAGS@ ++LDFLAGS?=@LDFLAGS@ ++LIBS?=@LIBS@ + DEFS=@DEFS@ + + # anything added to the standard flags by configure is moved to EXTRA_* + diff --git a/dev-libs/apr/files/apr-1.7.2-sysroot.patch b/dev-libs/apr/files/apr-1.7.2-sysroot.patch new file mode 100644 index 000000000000..3b666ebfd833 --- /dev/null +++ b/dev-libs/apr/files/apr-1.7.2-sysroot.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/385775 + +utilize $SYSROOT to find the right includedir tree + +drop the -L/-R paths since we know our libdir is the standard path which +the compiler already knows how to locate +--- a/apr-config.in ++++ b/apr-config.in +@@ -27,8 +27,8 @@ bindir="@bindir@" + libdir="@libdir@" + datarootdir="@datadir@" + datadir="@datadir@" +-installbuilddir="@installbuilddir@" +-includedir="@includedir@" ++installbuilddir="${SYSROOT}@installbuilddir@" ++includedir="${SYSROOT}@includedir@" + + CC="@CC@" + CPP="@CPP@" +@@ -199,7 +199,7 @@ while test $# -gt 0; do + --link-ld) + if test "$location" = "installed"; then + ### avoid using -L if libdir is a "standard" location like /usr/lib +- flags="$flags -L$libdir -l${APR_LIBNAME}" ++ flags="$flags -l${APR_LIBNAME}" + elif test "$location" = "crosscompile"; then + flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" + else +@@ -218,7 +218,7 @@ while test $# -gt 0; do + ### avoid using -L if libdir is a "standard" location like /usr/lib + # Since the user is specifying they are linking with libtool, we + # *know* that -R will be recognized by libtool. +- flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}" ++ flags="$flags -l${APR_LIBNAME}" + elif test "$location" = "crosscompile"; then + flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" + else |