From bf34ddedf11f450ddb296b06baf42830bcc7ca7b Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
Date: Mar 28 2020 11:32:38 +0000
Subject: Merge pull request #15 from duvallj/master


Various fixes for various -L flags, other build errors
---

diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index 97b87d7..deb2ca3 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -74,7 +74,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_GDB_HOST_VERSION:=7.12};
 : ${PKG_GDB_HOST_URL:=ftp://sourceware.org/pub/gdb/releases/gdb-${PKG_GDB_HOST_VERSION}.tar.gz};
 : ${PKG_GDB_HOST_CFLAGS_CONFIGURE_EXTRA:="-g3 -O0 -I${PREFIX}/include/python2.7"};
-: ${PKG_GDB_HOST_CONFIGURE_ARGS:="--disable-nls --prefix= --target=${DEFAULT_TARGET} --with-system-libiberty --with-system-readline --with-system-zlib --with-python=python2.7"};
+: ${PKG_GDB_HOST_CONFIGURE_ARGS:="--disable-nls --prefix= --target=${DEFAULT_TARGET} --with-system-libiberty --with-system-readline --with-system-zlib --with-python=python2.7 --with-guile=no --enable-guile=no"};
 : ${PKG_GDB_HOST_CXXFLAGS_CONFIGURE_EXTRA:="-fpermissive -g3 -O0 -I${PREFIX}/include/python2.7"};
 : ${PKG_GDB_HOST_ENV_VARS_EXTRA:="CFLAGS_FOR_TARGET=-g3 -O0 -I${PREFIX}/include/python2.7"};
 : ${PKG_GDB_HOST_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX}/lib"};
@@ -194,7 +194,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_RUBY_HOST_VERSION:=2.3.0};
 : ${PKG_RUBY_HOST_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_HOST_VERSION%.*}/ruby-${PKG_RUBY_HOST_VERSION}.tar.gz};
 : ${PKG_RUBY_HOST_BUILD_STEPS_DISABLE:=configure_patch};
-: ${PKG_RUBY_HOST_CFLAGS_CONFIGURE:="-g0 -O1"};
+: ${PKG_RUBY_HOST_CFLAGS_CONFIGURE:="-g0 -O1 -DHAVE_RL_USERNAME_COMPLETION_FUNCTION=1"};
 : ${PKG_RUBY_HOST_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-out-ext=fiddle,openssl"};
 : ${PKG_SQLITE3_HOST_DEPENDS:="libreadline_host ncurses_host"};
 : ${PKG_SQLITE3_HOST_SHA256SUM:=65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615};
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index b9e32e6..02de8ce 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -74,7 +74,7 @@ zstd")";
 : ${PKG_DBUS_VERSION:=1.11.20};
 : ${PKG_DBUS_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_VERSION}.tar.gz};
 : ${PKG_DBUS_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa};
-: ${PKG_DBUS_CONFIGURE_ARGS_EXTRA:=--disable-tests};
+: ${PKG_DBUS_CONFIGURE_ARGS_EXTRA:="--disable-tests --with-x=no"};
 : ${PKG_DEBIANUTILS_SHA256SUM:=099f1e8a7278b26145a2ba2dda84c4118403bfab38c8d7070a6235a7ffcb55ed};
 : ${PKG_DEBIANUTILS_VERSION:=4.8.6.1};
 : ${PKG_DEBIANUTILS_URL:=http://http.debian.net/debian/pool/main/d/debianutils/debianutils_${PKG_DEBIANUTILS_VERSION}.tar.xz};
@@ -143,7 +143,7 @@ zstd")";
 : ${PKG_HTOP_SHA256SUM:=d9d6826f10ce3887950d709b53ee1d8c1849a70fa38e91d5896ad8cbc6ba3c57};
 : ${PKG_HTOP_VERSION:=2.2.0};
 : ${PKG_HTOP_URL:=http://hisham.hm/htop/releases/${PKG_HTOP_VERSION}/htop-${PKG_HTOP_VERSION}.tar.gz};
-: ${PKG_HTOP_CONFIGURE_ARGS_EXTRA:="--enable-proc --enable-unicode"};
+: ${PKG_HTOP_CONFIGURE_ARGS_EXTRA:="--enable-proc --enable-unicode --verbose"};
 : ${PKG_HTOP_CFLAGS_CONFIGURE_EXTRA:="--include=sys/sysmacros.h"};
 : ${PKG_HTOP_ENV_VARS_EXTRA:="HTOP_NCURSES_CONFIG_SCRIPT=${PREFIX_NATIVE}/bin/ncurses-config:HTOP_NCURSES6_CONFIG_SCRIPT=${PREFIX_NATIVE}/bin/ncurses6-config:HTOP_NCURSESW_CONFIG_SCRIPT=${PREFIX_NATIVE}/bin/ncursesw-config:HTOP_NCURSESW6_CONFIG_SCRIPT=${PREFIX_NATIVE}/bin/ncursesw6-config"}
 : ${PKG_ICECAST_DEPENDS:="curl expat libressl libvorbis libxml2 libxslt"};
@@ -296,6 +296,7 @@ zstd")";
 : ${PKG_TDNF_VERSION:=2.0.0-alpha.1};
 : ${PKG_TDNF_URL:=https://github.com/vmware/tdnf/archive/v${PKG_TDNF_VERSION}.tar.gz};
 : ${PKG_TDNF_CONFIGURE_ARGS_EXTRA:="--disable-static"};
+: ${PKG_TDNF_ENV_VARS_EXTRA:="LIBSOLV_LIBS=-lsolv:LIBSOLVEXT_LIBS=-lsolvext"};
 : ${PKG_TDNF_FORCE_AUTORECONF:=1};
 : ${PKG_TDNF_IN_TREE:=1};
 : ${PKG_TDNF_SUBDIR:=tdnf-${PKG_TDNF_VERSION}};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 2582208..d59a627 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -62,7 +62,7 @@ socat thttpd w3m weechat wget whois")";
 : ${PKG_GNUTLS_SHA256SUM:=bb9acab8af2ac430edf45faaaa4ed2c51f86e57cb57689be6701aceef4732ca7};
 : ${PKG_GNUTLS_VERSION:=3.6.6};
 : ${PKG_GNUTLS_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_GNUTLS_VERSION%.*}/gnutls-${PKG_GNUTLS_VERSION}.tar.xz};
-: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-ssl3-support --disable-ssl2-support --disable-cxx --enable-local-libopts --with-included-libtasn1 --without-p11-kit --disable-hardware-acceleration"};
+: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-ssl3-support --disable-ssl2-support --disable-cxx --enable-local-libopts --with-included-libtasn1 --without-p11-kit --disable-hardware-acceleration --with-guile=no --enable-guile=no"};
 : ${PKG_GNUTLS_LIBTOOL:=slibtool-shared};
 : ${PKG_HTTPD_SHA256SUM:=f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2};
 : ${PKG_HTTPD_VERSION:=2.4.25};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index e11be92..bfb4935 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -73,6 +73,7 @@ libxslt libz libzip")";
 : ${PKG_LIBFLAC_SHA256SUM:=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748};
 : ${PKG_LIBFLAC_VERSION:=1.3.3};
 : ${PKG_LIBFLAC_URL:=https://ftp.osuosl.org/pub/xiph/releases/flac/flac-${PKG_LIBFLAC_VERSION}.tar.xz};
+: ${PKG_LIBFLAC_CONFIGURE_ARGS_EXTRA:="--with-ogg=yes"};
 : ${PKG_LIBGCRYPT_DEPENDS:="libgpg_error"};
 : ${PKG_LIBGCRYPT_SHA256SUM:=3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3};
 : ${PKG_LIBGCRYPT_VERSION:=1.8.5};
diff --git a/patches/curl-7.61.0.local.patch b/patches/curl-7.61.0.local.patch
index 3376743..3794ece 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 0000000..d6529b8
--- /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/libgpg_error-1.36_pre.local.patch b/patches/libgpg_error-1.36_pre.local.patch
index 2ea651c..da2dbf9 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 3cad816..a31eb9f 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 759c759..1ba9ace 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
diff --git a/patches/zstd-1.3.4.local.patch b/patches/zstd-1.3.4.local.patch
index 10723d6..40e5250 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}