46768830ae
Now x11-packages repository will use original names for packages. For example, libgtk2 now will be provided as gtk2, libgtk3 will be available as gtk3, libsdl - as sdl. List of changed packages: libatk --> atk libglu --> glu libgtk2 --> gtk2 libgtk3 --> gtk3 libmesa --> mesa libsdl --> sdl libsdl2 --> sdl2 libsdl-net --> sdl-net riscvemu-sdl --> riscvemu xorg-xvfb --> xorg-server-xvfb List of dependent packages (should be rebuilt with new deps): dosbox, emacs-x, galculator, geany, libepoxy, mtpaint, qemu-system-x86_64, the-powder-toy, tigervnc, wireshark-gtk, xarchiver. Note: depending on which packages are installed, it may be necessary to upgrade with 'apt dist-upgrade'.
124 lines
3.9 KiB
Diff
124 lines
3.9 KiB
Diff
diff -uNr gtk-3.22.30/m4/lib-ld.m4 gtk-3.22.30.mod/m4/lib-ld.m4
|
|
--- gtk-3.22.30/m4/lib-ld.m4 1970-01-01 03:00:00.000000000 +0300
|
|
+++ gtk-3.22.30.mod/m4/lib-ld.m4 2018-06-22 20:55:46.574626255 +0300
|
|
@@ -0,0 +1,119 @@
|
|
+# lib-ld.m4 serial 6
|
|
+dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
|
|
+dnl This file is free software; the Free Software Foundation
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
+
|
|
+dnl Subroutines of libtool.m4,
|
|
+dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
|
|
+dnl collision with libtool.m4.
|
|
+
|
|
+dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
|
|
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
|
|
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
|
|
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
|
|
+case `$LD -v 2>&1 </dev/null` in
|
|
+*GNU* | *'with BFD'*)
|
|
+ acl_cv_prog_gnu_ld=yes
|
|
+ ;;
|
|
+*)
|
|
+ acl_cv_prog_gnu_ld=no
|
|
+ ;;
|
|
+esac])
|
|
+with_gnu_ld=$acl_cv_prog_gnu_ld
|
|
+])
|
|
+
|
|
+dnl From libtool-2.4. Sets the variable LD.
|
|
+AC_DEFUN([AC_LIB_PROG_LD],
|
|
+[AC_REQUIRE([AC_PROG_CC])dnl
|
|
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
+
|
|
+AC_ARG_WITH([gnu-ld],
|
|
+ [AS_HELP_STRING([--with-gnu-ld],
|
|
+ [assume the C compiler uses GNU ld [default=no]])],
|
|
+ [test "$withval" = no || with_gnu_ld=yes],
|
|
+ [with_gnu_ld=no])dnl
|
|
+
|
|
+# Prepare PATH_SEPARATOR.
|
|
+# The user is always right.
|
|
+if test "${PATH_SEPARATOR+set}" != set; then
|
|
+ # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
|
|
+ # contains only /bin. Note that ksh looks also at the FPATH variable,
|
|
+ # so we have to set that as well for the test.
|
|
+ PATH_SEPARATOR=:
|
|
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
|
|
+ && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
|
|
+ || PATH_SEPARATOR=';'
|
|
+ }
|
|
+fi
|
|
+
|
|
+ac_prog=ld
|
|
+if test "$GCC" = yes; then
|
|
+ # Check if gcc -print-prog-name=ld gives a path.
|
|
+ AC_MSG_CHECKING([for ld used by $CC])
|
|
+ case $host in
|
|
+ *-*-mingw*)
|
|
+ # gcc leaves a trailing carriage return which upsets mingw
|
|
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
|
+ *)
|
|
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
|
+ esac
|
|
+ case $ac_prog in
|
|
+ # Accept absolute paths.
|
|
+ [[\\/]]* | ?:[[\\/]]*)
|
|
+ re_direlt='/[[^/]][[^/]]*/\.\./'
|
|
+ # Canonicalize the pathname of ld
|
|
+ ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
|
|
+ while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
|
|
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
|
+ done
|
|
+ test -z "$LD" && LD="$ac_prog"
|
|
+ ;;
|
|
+ "")
|
|
+ # If it fails, then pretend we aren't using GCC.
|
|
+ ac_prog=ld
|
|
+ ;;
|
|
+ *)
|
|
+ # If it is relative, then search for the first ld in PATH.
|
|
+ with_gnu_ld=unknown
|
|
+ ;;
|
|
+ esac
|
|
+elif test "$with_gnu_ld" = yes; then
|
|
+ AC_MSG_CHECKING([for GNU ld])
|
|
+else
|
|
+ AC_MSG_CHECKING([for non-GNU ld])
|
|
+fi
|
|
+AC_CACHE_VAL([acl_cv_path_LD],
|
|
+[if test -z "$LD"; then
|
|
+ acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
|
|
+ for ac_dir in $PATH; do
|
|
+ IFS="$acl_save_ifs"
|
|
+ test -z "$ac_dir" && ac_dir=.
|
|
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
|
+ acl_cv_path_LD="$ac_dir/$ac_prog"
|
|
+ # Check to see if the program is GNU ld. I'd rather use --version,
|
|
+ # but apparently some variants of GNU ld only accept -v.
|
|
+ # Break only if it was the GNU/non-GNU ld that we prefer.
|
|
+ case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
|
|
+ *GNU* | *'with BFD'*)
|
|
+ test "$with_gnu_ld" != no && break
|
|
+ ;;
|
|
+ *)
|
|
+ test "$with_gnu_ld" != yes && break
|
|
+ ;;
|
|
+ esac
|
|
+ fi
|
|
+ done
|
|
+ IFS="$acl_save_ifs"
|
|
+else
|
|
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
|
|
+fi])
|
|
+LD="$acl_cv_path_LD"
|
|
+if test -n "$LD"; then
|
|
+ AC_MSG_RESULT([$LD])
|
|
+else
|
|
+ AC_MSG_RESULT([no])
|
|
+fi
|
|
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
|
+AC_LIB_PROG_LD_GNU
|
|
+])
|