From 393269f9b4010023cf414a4bd4fa8a9fda7c0ee4 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Feb 02 2020 22:23:13 +0000 Subject: vars/build.vars:host_packages_deps: adds texinfo_host v6.7 (via Redfoxmoon.) vars/build.vars:libksba:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --with-libgpg-error-prefix=${PREFIX_NATIVE} (via Redfoxmoon.) vars/build.vars:make: updated to v4.3 (via Redfoxmoon.) vars/build.vars:native_packages_etc: adds texinfo v6.7 (via Redfoxmoon.) patches/libksba-1.3.5.local.patch: removes obsolete patch (via Redfoxmoon.) vars/libksba.vars: via Redfoxmoon. vars/make.vars: via Redfoxmoon. --- diff --git a/patches/libksba-1.3.5.local.patch b/patches/libksba-1.3.5.local.patch deleted file mode 100644 index 9c9420b..0000000 --- a/patches/libksba-1.3.5.local.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- libksba-1.3.5/baconfigure.orig 2016-08-22 11:56:54.000000000 +0200 -+++ libksba-1.3.5/configure 2016-10-18 22:46:31.763896688 +0200 -@@ -13852,155 +13852,9 @@ - # Checks for libraries. - # - -- gpg_error_config_prefix="" -+#Overcomplicated and useless check for gpg-error, use CFLAGS and LDFLAGS! >:( -+ GPG_ERROR_LIBS="-lgpg-error" - --# Check whether --with-libgpg-error-prefix was given. --if test "${with_libgpg_error_prefix+set}" = set; then : -- withval=$with_libgpg_error_prefix; gpg_error_config_prefix="$withval" --fi -- -- -- --# Check whether --with-gpg-error-prefix was given. --if test "${with_gpg_error_prefix+set}" = set; then : -- withval=$with_gpg_error_prefix; gpg_error_config_prefix="$withval" --fi -- -- -- if test x"${GPG_ERROR_CONFIG}" = x ; then -- if test x"${gpg_error_config_prefix}" != x ; then -- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" -- else -- case "${SYSROOT}" in -- /*) -- if test -x "${SYSROOT}/bin/gpg-error-config" ; then -- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" -- fi -- ;; -- '') -- ;; -- *) -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5 --$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;} -- ;; -- esac -- fi -- fi -- -- # Extract the first word of "gpg-error-config", so it can be a program name with args. --set dummy gpg-error-config; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_GPG_ERROR_CONFIG+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $GPG_ERROR_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_GPG_ERROR_CONFIG="$GPG_ERROR_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_GPG_ERROR_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_GPG_ERROR_CONFIG" && ac_cv_path_GPG_ERROR_CONFIG="no" -- ;; --esac --fi --GPG_ERROR_CONFIG=$ac_cv_path_GPG_ERROR_CONFIG --if test -n "$GPG_ERROR_CONFIG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPG_ERROR_CONFIG" >&5 --$as_echo "$GPG_ERROR_CONFIG" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- min_gpg_error_version="$NEED_GPG_ERROR_VERSION" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5 --$as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; } -- ok=no -- if test "$GPG_ERROR_CONFIG" != "no" \ -- && test -f "$GPG_ERROR_CONFIG" ; then -- req_major=`echo $min_gpg_error_version | \ -- sed 's/\([0-9]*\)\.\([0-9]*\)/\1/'` -- req_minor=`echo $min_gpg_error_version | \ -- sed 's/\([0-9]*\)\.\([0-9]*\)/\2/'` -- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` -- major=`echo $gpg_error_config_version | \ -- sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'` -- minor=`echo $gpg_error_config_version | \ -- sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'` -- if test "$major" -gt "$req_major"; then -- ok=yes -- else -- if test "$major" -eq "$req_major"; then -- if test "$minor" -ge "$req_minor"; then -- ok=yes -- fi -- fi -- fi -- fi -- if test $ok = yes; then -- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` -- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` -- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` -- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($gpg_error_config_version)" >&5 --$as_echo "yes ($gpg_error_config_version)" >&6; } -- : -- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` -- if test x"$gpg_error_config_host" != xnone ; then -- if test x"$gpg_error_config_host" != x"$host" ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --*** --*** The config script $GPG_ERROR_CONFIG was --*** built for $gpg_error_config_host and thus may not match the --*** used host $host. --*** You may want to use the configure option --with-gpg-error-prefix --*** to specify a matching config script or use \$SYSROOT. --***" >&5 --$as_echo "$as_me: WARNING: --*** --*** The config script $GPG_ERROR_CONFIG was --*** built for $gpg_error_config_host and thus may not match the --*** used host $host. --*** You may want to use the configure option --with-gpg-error-prefix --*** to specify a matching config script or use \$SYSROOT. --***" >&2;} -- gpg_config_script_warn="$gpg_config_script_warn libgpg-error" -- fi -- fi -- else -- GPG_ERROR_CFLAGS="" -- GPG_ERROR_LIBS="" -- GPG_ERROR_MT_CFLAGS="" -- GPG_ERROR_MT_LIBS="" -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- : -- fi -- -- -- -- -- --if test "x$GPG_ERROR_LIBS" = "x"; then -- as_fn_error $? "libgpg-error is needed. -- See ftp://ftp.gnupg.org/gcrypt/libgpg-error/ ." "$LINENO" 5 --fi - - - $as_echo "#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_KSBA" >>confdefs.h diff --git a/vars/build.vars b/vars/build.vars index 3bbd9ed..c6c0de1 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -531,7 +531,7 @@ clzip_host ncurses_host ncursestw_host cmake_host musl_fts_host libzip_host llvm_host clang_host libffi_host expat_host ncursesw_host libreadline_host python2_host gdb_host dbus_host infounzip_host infozip_host intltool_host xz_host python3_host glib_host dbus_glib_host gperf_host -ruby_host tzdb_host"; +ruby_host texinfo_host tzdb_host"; HOST_PACKAGES_DEPS_PREFIX="${PREFIX}"; : ${PKG_CLZIP_HOST_SHA256SUM:=d9d51212afa80371dc2546d278ef8ebbb3cd57c06fdd761b7b204497586d24c0}; : ${PKG_CLZIP_HOST_VERSION:=1.11}; @@ -653,6 +653,10 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}"; : ${PKG_RUBY_HOST_BUILD_STEPS_DISABLE:=configure_patch}; : ${PKG_RUBY_HOST_CFLAGS_CONFIGURE:="-g0 -O1"}; : ${PKG_RUBY_HOST_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-out-ext=fiddle,openssl"}; +: ${PKG_TEXINFO_HOST_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa}; +: ${PKG_TEXINFO_HOST_VERSION:=6.7}; +: ${PKG_TEXINFO_HOST_URL:=https://ftp.gnu.org/gnu/texinfo/texinfo-${PKG_TEXINFO_HOST_VERSION}.tar.xz}; +: ${PKG_TEXINFO_HOST_DISABLED:=1}; : ${PKG_TZDB_HOST_SHA256SUM:=b1c23c7825f5f842e6e1ddb702efe85b1c22bdf0e41815b927cfc04a28372962}; : ${PKG_TZDB_HOST_VERSION:=2018e}; : ${PKG_TZDB_HOST_URL:=https://data.iana.org/time-zones/releases/tzdb-${PKG_TZDB_HOST_VERSION}.tar.lz}; @@ -912,6 +916,7 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2"; : ${PKG_LIBKSBA_SHA256SUM:=41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340}; : ${PKG_LIBKSBA_VERSION:=1.3.5}; : ${PKG_LIBKSBA_URL:=https://www.gnupg.org/ftp/gcrypt/libksba/libksba-${PKG_LIBKSBA_VERSION}.tar.bz2}; +: ${PKG_LIBKSBA_CONFIGURE_ARGS_EXTRA:=--with-libgpg-error-prefix=${PREFIX_NATIVE}}; : ${PKG_LIBUDNS_URLS_GIT:=libudns=https://github.com/shadowsocks/libudns.git@master}; : ${PKG_LUA_SHA256SUM:=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c}; : ${PKG_LUA_VERSION:=5.3.4}; @@ -1464,9 +1469,9 @@ bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils : ${PKG_M4_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07}; : ${PKG_M4_VERSION:=1.4.18}; : ${PKG_M4_URL:=https://ftp.gnu.org/gnu/m4/m4-${PKG_M4_VERSION}.tar.xz}; -: ${PKG_MAKE_SHA256SUM:=d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589}; -: ${PKG_MAKE_VERSION:=4.2.1}; -: ${PKG_MAKE_URL:=https://ftp.gnu.org/gnu/make/make-${PKG_MAKE_VERSION}.tar.bz2}; +: ${PKG_MAKE_SHA256SUM:=e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19}; +: ${PKG_MAKE_VERSION:=4.3}; +: ${PKG_MAKE_URL:=https://ftp.gnu.org/gnu/make/make-${PKG_MAKE_VERSION}.tar.gz}; : ${PKG_MANDOC_SHA256SUM:=b1c9a2f27c487d6be08387aab7602199fd356086631d6e3f471b00c75249082d}; : ${PKG_MANDOC_VERSION:=1.14.3}; : ${PKG_MANDOC_URL:=https://midipix.org/mirror/mandoc/mandoc-${PKG_MANDOC_VERSION}.tar.gz}; @@ -1530,7 +1535,7 @@ bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils NATIVE_PACKAGES_ETC_PACKAGES=" bochs ca_certificates cron dante debianutils emacs fetchmail ffmpeg gdb gnuchess ghostscript hastyhex hexcurse htop icecast isync infounzip infozip imagemagick john less libredwg lolcode mlogin mc mintty nano ncdu nullmailer openbsd_baseutils opensmtpd p7zip procps_ng qemu qpdf rdesktop rw rxvt_unicode st -tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd"; +texinfo tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd"; : ${PKG_BOCHS_SHA256SUM:=ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c}; : ${PKG_BOCHS_VERSION:=2.6.9}; : ${PKG_BOCHS_URL:=https://sourceforge.mirrorservice.org/b/bo/bochs/bochs/${PKG_BOCHS_VERSION}/bochs-${PKG_BOCHS_VERSION}.tar.gz}; @@ -1734,6 +1739,9 @@ fi; : ${PKG_ST_IN_TREE:=1}; : ${PKG_ST_INSTALL_FILES:=../st-${PKG_ST_VERSION}/st=bin/ ../st-${PKG_ST_VERSION}/st.1=share/man/man1/ ../st-${PKG_ST_VERSION}/st.info=bin/}; : ${PKG_ST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib -lX11 -lXft -lfreetype -lfontconfig}; +: ${PKG_TEXINFO_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa}; +: ${PKG_TEXINFO_VERSION:=6.7}; +: ${PKG_TEXINFO_URL:=https://ftp.gnu.org/gnu/texinfo/texinfo-${PKG_TEXINFO_VERSION}.tar.xz}; : ${PKG_TMUX_SHA256SUM:=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b}; : ${PKG_TMUX_VERSION:=2.3}; : ${PKG_TMUX_URL:=https://github.com/tmux/tmux/releases/download/${PKG_TMUX_VERSION}/tmux-${PKG_TMUX_VERSION}.tar.gz}; diff --git a/vars/libksba.vars b/vars/libksba.vars new file mode 100644 index 0000000..1f7efbf --- /dev/null +++ b/vars/libksba.vars @@ -0,0 +1,9 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_LIBKSBA_CONFIG_CACHE_EXTRA:=" +ksba_cv_visibility_attribute=yes +ksba_cv_broken_visibility_attribute=no"}; + +# vim:filetype=sh diff --git a/vars/make.vars b/vars/make.vars new file mode 100644 index 0000000..9883d5e --- /dev/null +++ b/vars/make.vars @@ -0,0 +1,9 @@ +# +# set -o errexit -o noglob are assumed. +# + +: ${PKG_MAKE_CONFIG_CACHE_EXTRA:=" +make_cv_synchronous_posix_spawn=yes +ac_cv_func_gettimeofday=yes"}; + +# vim:filetype=sh