diff options
| -rw-r--r-- | groups/010.host_deps.group | 4 | ||||
| -rw-r--r-- | groups/231.native_packages_etc.group | 4 | ||||
| -rw-r--r-- | groups/241.native_packages_inet.group | 2 | ||||
| -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 |
6 files changed, 72 insertions, 7 deletions
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group index 97b87d7e..deb2ca32 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 b9e32e6e..c0c61ac9 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"}; diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 2582208c..d59a627f 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/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 |