From 59765f508225998d8a73b1da8380ff06b4a6b79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Mon, 14 Nov 2016 23:02:47 +0100 Subject: 1) Replaces the SysV-style build script link mechanism w/ build {,meta-}targets, 2) splits build.{subr,sh}} into subr/{build,pkg,rtl}.subr and build.sh, 3) replaces {997.strip,998.midipix_sh,999.tarballs}.build with subr/{strip,tarball}.subr, 4) moves patches to patches/, vars files to vars/, and everything else to etc/, 5) renames `Create `Midipix mintty shell' shortcut.vbs' to midipix_shortcut.vbs, 6) fixes a Weechat configure issue, and 7) updates etc/{build.usage,README}. --- patches/libassuan-2.4.3.local.patch | 192 ++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) create mode 100644 patches/libassuan-2.4.3.local.patch (limited to 'patches/libassuan-2.4.3.local.patch') diff --git a/patches/libassuan-2.4.3.local.patch b/patches/libassuan-2.4.3.local.patch new file mode 100644 index 00000000..8e0265b0 --- /dev/null +++ b/patches/libassuan-2.4.3.local.patch @@ -0,0 +1,192 @@ +--- libassuan-2.4.3.orig/configure 2016-07-14 10:11:48.000000000 +0200 ++++ libassuan-2.4.3/configure 2016-10-18 22:20:05.511896688 +0200 +@@ -14171,187 +14171,8 @@ + + # Checking for libgpg-error. + +- gpg_error_config_prefix="" +- +-# 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_prefix != x ; then +- if test x${GPG_ERROR_CONFIG+set} != xset ; then +- GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config +- fi +- fi +- +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}gpg-error-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}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 +- +- ;; +-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 +- +- +-fi +-if test -z "$ac_cv_path_GPG_ERROR_CONFIG"; then +- ac_pt_GPG_ERROR_CONFIG=$GPG_ERROR_CONFIG +- # 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_ac_pt_GPG_ERROR_CONFIG+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $ac_pt_GPG_ERROR_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_ac_pt_GPG_ERROR_CONFIG="$ac_pt_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_ac_pt_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 +- +- ;; +-esac +-fi +-ac_pt_GPG_ERROR_CONFIG=$ac_cv_path_ac_pt_GPG_ERROR_CONFIG +-if test -n "$ac_pt_GPG_ERROR_CONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GPG_ERROR_CONFIG" >&5 +-$as_echo "$ac_pt_GPG_ERROR_CONFIG" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_pt_GPG_ERROR_CONFIG" = x; then +- GPG_ERROR_CONFIG="no" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- GPG_ERROR_CONFIG=$ac_pt_GPG_ERROR_CONFIG +- fi +-else +- GPG_ERROR_CONFIG="$ac_cv_path_GPG_ERROR_CONFIG" +-fi +- +- min_gpg_error_version=1.17 +- { $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` +- { $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. +-***" >&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. +-***" >&2;} +- fi +- fi +- else +- GPG_ERROR_CFLAGS="" +- GPG_ERROR_LIBS="" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- as_fn_error $? "libgpg-error was not found" "$LINENO" 5 +- fi +- +- +- ++#Overcomplicated useless checking for gpg-error, use CFLAGS and LDFLAGS! >:( ++ GPG_ERROR_LIBS="-lgpg-error" + + # + # Checks for library functions. -- cgit v1.2.3