diff options
| author | Jack Duvall <jediguy9@gmail.com> | 2020-03-11 12:37:41 -0400 |
|---|---|---|
| committer | Jack Duvall <jediguy9@gmail.com> | 2020-03-27 17:35:35 -0400 |
| commit | 35039d6e54cd50a96fc8511188a8d326d45cd9c6 (patch) | |
| tree | 717235df5f167c421e09d50607aeeff269817d68 /patches | |
| parent | 35a2faf07e9ad3ff232b2c2023103f0ac67a304f (diff) | |
| download | midipix_build-35039d6e54cd50a96fc8511188a8d326d45cd9c6.tar.bz2 midipix_build-35039d6e54cd50a96fc8511188a8d326d45cd9c6.tar.xz | |
Fix some erraneous -L in config scripts
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/libgpg_error-1.36_pre.local.patch | 38 | ||||
| -rw-r--r-- | patches/ncurses-6.1.local.patch | 16 | ||||
| -rw-r--r-- | patches/slang-2.3.2.local.patch | 15 |
3 files changed, 67 insertions, 2 deletions
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 |