diff options
Diffstat (limited to 'net-irc/unrealircd/files/unrealircd-4.0.12-without-privatelibdir.patch')
| -rw-r--r-- | net-irc/unrealircd/files/unrealircd-4.0.12-without-privatelibdir.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/net-irc/unrealircd/files/unrealircd-4.0.12-without-privatelibdir.patch b/net-irc/unrealircd/files/unrealircd-4.0.12-without-privatelibdir.patch new file mode 100644 index 000000000000..03b7a7a0eb2c --- /dev/null +++ b/net-irc/unrealircd/files/unrealircd-4.0.12-without-privatelibdir.patch @@ -0,0 +1,70 @@ +From 2b94733cbe0161b58084a2e7a26985e6d321e1c8 Mon Sep 17 00:00:00 2001 +From: Nathan Phillip Brink <binki@gentoo.org> +Date: Thu, 6 Jul 2017 06:04:18 +0000 +Subject: [PATCH] Support --without-privatelibdir for packagers. + +--- + configure.ac | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 78360df..aa49df5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -586,15 +586,19 @@ AC_ARG_WITH(pidfile, [AS_HELP_STRING([--with-pidfile=path],[Specify the path of + [AC_DEFINE_UNQUOTED([PIDFILE], ["$HOME/unrealircd/data/unrealircd.pid"], [Define the path of the pid file]) + PIDFILE="$HOME/unrealircd/data/unrealircd.pid"]) + +-LDFLAGS_PRIVATELIBS="" +-AC_ARG_WITH(privatelibdir, [AS_HELP_STRING([--with-privatelibdir=path],[Specify the directory where private libraries are stored])], +- [AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$withval"], [Define the location of private libraries]) +- PRIVATELIBDIR="$withval" +- LDFLAGS_PRIVATELIBS="-Wl,-rpath=$PRIVATELIBDIR" +- LDFLAGS="$LDFLAGS $LDFLAGS_PRIVATELIBS" +- export LDFLAGS], +- [AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$HOME/unrealircd/lib"], [Define the location of private libraries]) +- PRIVATELIBDIR="$HOME/unrealircd/lib" ++dnl Ensure that this “feature” can be disabled as it makes it harder to package unrealircd. ++dnl Users have always been able to specify “./configure LDFLAGS=-Wl,-rpath,/path/to/blah”—binki ++AC_ARG_WITH(privatelibdir, [AS_HELP_STRING([--with-privatelibdir=path],[Specify the directory where private libraries are stored. Disable when building a package for a distro])], ++ [], ++ [with_privatelibdir="yes"]) ++AS_IF([test "x$with_privatelibdir" = "xno"], ++ [PRIVATELIBDIR=], ++ [test "x$with_privatelibdir" = "xyes"], ++ [PRIVATELIBDIR="$HOME/unrealircd/lib"], ++ [PRIVATELIBDIR="$with_privatelibdir"]) ++AS_IF([test "x$PRIVATELIBDIR" = "x"], ++ [LDFLAGS_PRIVATELIBS=""], ++ [AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$PRIVATELIBDIR"], [Define the location of private libraries]) + LDFLAGS_PRIVATELIBS="-Wl,-rpath=$PRIVATELIBDIR" + LDFLAGS="$LDFLAGS $LDFLAGS_PRIVATELIBS" + export LDFLAGS]) +-- +2.4.6 + +From 6591e6bcee0858b7cddf6fcfee7dbe04ae511169 Mon Sep 17 00:00:00 2001 +From: Nathan Phillip Brink <binki@gentoo.org> +Date: Thu, 6 Jul 2017 06:43:20 +0000 +Subject: [PATCH] Do not try to delete libcares when not using PRIVATELIBDIR. + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index aa49df5..874d58f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -786,7 +786,7 @@ dnl Use system c-ares when available, unless --without-system-cares. + has_system_cares="no" + AS_IF([test "x$with_system_cares" = "xyes"],[ + PKG_CHECK_MODULES([CARES], libcares >= 1.6.0,[has_system_cares=yes +-rm -f "$PRIVATELIBDIR/"libcares*],[has_system_cares=no])]) ++AS_IF([test "x$PRIVATELIBDIR" != "x"], [rm -f "$PRIVATELIBDIR/"libcares*])],[has_system_cares=no])]) + + AS_IF([test "$has_system_cares" = "no"], [ + dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE! +-- +2.4.6 + |