From 35039d6e54cd50a96fc8511188a8d326d45cd9c6 Mon Sep 17 00:00:00 2001 From: Jack Duvall Date: Wed, 11 Mar 2020 12:37:41 -0400 Subject: Fix some erraneous -L in config scripts --- patches/libgpg_error-1.36_pre.local.patch | 38 +++++++++++++++++++++++++++++-- patches/ncurses-6.1.local.patch | 16 +++++++++++++ patches/slang-2.3.2.local.patch | 15 ++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) (limited to 'patches') diff --git a/patches/libgpg_error-1.36_pre.local.patch b/patches/libgpg_error-1.36_pre.local.patch index 2ea651c3..da2dbf99 100644 --- a/patches/libgpg_error-1.36_pre.local.patch +++ b/patches/libgpg_error-1.36_pre.local.patch @@ -152,8 +152,42 @@ index c9de9c1..285e45f 100644 + print pkg_namespace "msgidxof (int code)"; print "{"; print " return (0 ? 0"; - + -- 2.11.0 +diff -ru a/configure.ac b/configure.ac +--- a/configure.ac 2019-03-19 04:56:05.000000000 -0400 ++++ b/configure.ac 2020-03-11 12:27:31.000000000 -0400 +@@ -549,19 +549,19 @@ + fi + ;; + esac +-case "$libdir" in +- /usr/lib|/usr/lib64|/lib|/lib64) ;; +- '${exec_prefix}/lib') +- if test "$exec_prefix" = "NONE"; then +- if test "$prefix" != / -a "$prefix" != /usr; then +- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" +- fi +- elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then +- GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" +- fi +- ;; +- *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; +-esac ++#case "$libdir" in ++# /usr/lib|/usr/lib64|/lib|/lib64) ;; ++# '${exec_prefix}/lib') ++# if test "$exec_prefix" = "NONE"; then ++# if test "$prefix" != / -a "$prefix" != /usr; then ++# GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ++# fi ++# elif test "$exec_prefix" != / -a "$exec_prefix" != /usr; then ++# GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ++# fi ++# ;; ++# *) GPG_ERROR_CONFIG_LIBS="-L$libdir $GPG_ERROR_CONFIG_LIBS" ;; ++#esac - + AC_SUBST(GPG_ERROR_CONFIG_LIBS) + AC_SUBST(GPG_ERROR_CONFIG_CFLAGS) diff --git a/patches/ncurses-6.1.local.patch b/patches/ncurses-6.1.local.patch index 3cad8166..a31eb9f8 100644 --- a/patches/ncurses-6.1.local.patch +++ b/patches/ncurses-6.1.local.patch @@ -104,3 +104,19 @@ diff -ru a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in @MAKE_PC_FILES@ done \ @MAKE_PC_FILES@ ;; \ @MAKE_PC_FILES@ (*) \ +diff -ru a/misc/ncurses-config.in b/misc/ncurses-config.in +--- a/misc/ncurses-config.in 2018-01-20 00:27:18.000000000 +0000 ++++ b/misc/ncurses-config.in 2020-03-11 15:38:05.000000000 +0000 +@@ -111,12 +111,7 @@ + ;; + --libs) +- if test "$libdir" = /usr/lib +- then +- LIBDIR= +- else +- LIBDIR=-L$libdir +- fi ++ LIBDIR= + if test @TINFO_NAME@ = @LIB_NAME@ ; then + sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO + $LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@ diff --git a/patches/slang-2.3.2.local.patch b/patches/slang-2.3.2.local.patch index 759c759f..1ba9ace1 100644 --- a/patches/slang-2.3.2.local.patch +++ b/patches/slang-2.3.2.local.patch @@ -10,3 +10,18 @@ diff -ru slang-2.3.2.orig/modules/Makefile.in slang-2.3.2/modules/Makefile.in CC_SHARED_FLAGS = @CC_SHARED_FLAGS@ CC_SHARED = $(CC) $(INCS) $(CC_SHARED_FLAGS) $(CFLAGS) CONFIG_DIR = @CONFIG_DIR@ +diff --git a/slsh/Makefile.in b/slsh/Makefile.in +index cba9d81..78e6054 100644 +--- a/slsh/Makefile.in ++++ b/slsh/Makefile.in +@@ -15,7 +15,7 @@ exec_prefix = @exec_prefix@ + datarootdir = @datarootdir@ + INST_LIB_DIR = @libdir@ + SLANG_INST_INC = -I@includedir@ +-SLANG_INST_LIB = -L$(INST_LIB_DIR) ++#SLANG_INST_LIB = -L$(INST_LIB_DIR) + #--------------------------------------------------------------------------- + SLANG_SRCINC = -I@SRCDIR@ + SLANG_ELFLIB = -L@ELFDIR@# for dynamically linked +-- +2.24.0 -- cgit v1.2.3 From 0c01fac9809d4ebee67eaf74f90435daa4ba0c4f Mon Sep 17 00:00:00 2001 From: Jack Duvall Date: Fri, 27 Mar 2020 17:33:38 -0400 Subject: Final patches to make things work all the way through --- patches/curl-7.61.0.local.patch | 21 +++++++++++++++++++-- patches/libassuan-2.5.3_pre.local.patch | 17 +++++++++++++++++ patches/zstd-1.3.4.local.patch | 15 +++++++++++++-- 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 patches/libassuan-2.5.3_pre.local.patch (limited to 'patches') diff --git a/patches/curl-7.61.0.local.patch b/patches/curl-7.61.0.local.patch index 3376743f..3794ecea 100644 --- a/patches/curl-7.61.0.local.patch +++ b/patches/curl-7.61.0.local.patch @@ -1,5 +1,6 @@ ---- curl-7.61.0/configure.orig 2018-07-09 07:52:18.000000000 +0100 -+++ curl-7.61.0/configure 2020-03-12 08:51:25.825416713 +0000 +diff -ru a/configure b/configure +--- a/configure 2018-07-09 07:52:18.000000000 +0100 ++++ b/configure 2020-03-12 08:51:25.825416713 +0000 @@ -14553,6 +14553,16 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -893,3 +894,19 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler halts on compilation errors" >&5 $as_echo_n "checking if compiler halts on compilation errors... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext +diff -ru a/curl-config.in b/curl-config.in +--- a/curl-config.in 2018-06-14 10:31:24.000000000 -0400 ++++ b/curl-config.in 2020-03-27 15:39:03.029645413 -0400 +@@ -143,11 +143,7 @@ + ;; + + --libs) +- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then +- CURLLIBDIR="-L@libdir@ " +- else +- CURLLIBDIR="" +- fi ++ CURLLIBDIR="" + if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then + echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ + else diff --git a/patches/libassuan-2.5.3_pre.local.patch b/patches/libassuan-2.5.3_pre.local.patch new file mode 100644 index 00000000..d6529b87 --- /dev/null +++ b/patches/libassuan-2.5.3_pre.local.patch @@ -0,0 +1,17 @@ +diff -ru a/src/libassuan-config.in b/src/libassuan-config.in +--- a/src/libassuan-config.in 2018-10-25 05:20:28.000000000 -0400 ++++ b/src/libassuan-config.in 2020-03-11 18:47:54.410306584 -0400 +@@ -131,13 +131,5 @@ + fi + + if test "$echo_libs" = "yes"; then +- if test "@libdir@" != "/usr/lib" ; then +- libdirs="-L@libdir@" +- for i in $lib $extralibs ; do +- if test "$i" = "-L@libdir@" ; then +- libdirs="" +- fi +- done +- fi + echo $libdirs $lib $extralibs + fi diff --git a/patches/zstd-1.3.4.local.patch b/patches/zstd-1.3.4.local.patch index 10723d67..40e5250d 100644 --- a/patches/zstd-1.3.4.local.patch +++ b/patches/zstd-1.3.4.local.patch @@ -1,5 +1,6 @@ ---- zstd-1.3.4/programs/Makefile.orig 2018-03-26 22:19:34.000000000 +0000 -+++ zstd-1.3.4/programs/Makefile 2018-04-30 14:55:39.468000000 +0000 +diff -ru a/programs/Makefile b/programs/Makefile +--- a/programs/Makefile 2018-03-26 22:19:34.000000000 +0000 ++++ b/programs/Makefile 2018-04-30 14:55:39.468000000 +0000 @@ -38,7 +38,6 @@ CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/compress \ -I$(ZSTDDIR)/dictBuilder \ @@ -8,3 +9,13 @@ DEBUGFLAGS+=-Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \ -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \ -Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \ +diff -ru a/lib/libzstd.pc.in b/lib/libzstd.pc.in +--- a/lib/libzstd.pc.in 2020-03-27 11:36:13.368590549 -0400 ++++ b/lib/libzstd.pc.in 2020-03-27 11:36:28.362034466 -0400 +@@ -10,5 +10,5 @@ + Description: fast lossless compression algorithm library + URL: http://www.zstd.net/ + Version: @VERSION@ +-Libs: -L${libdir} -lzstd ++Libs: -lzstd + Cflags: -I${includedir} -- cgit v1.2.3