Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 524092 Details for
Bug 650608
[PATCH] sys-devel/make[guile] compile against dev-scheme/guile-2.2
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
make-4.2.1_guile-2.2.patch
make-4.2.1_guile-2.2.patch (text/plain), 15.72 KB, created by
Benda Xu
on 2018-03-16 06:03:48 UTC
(
hide
)
Description:
make-4.2.1_guile-2.2.patch
Filename:
MIME Type:
Creator:
Benda Xu
Created:
2018-03-16 06:03:48 UTC
Size:
15.72 KB
patch
obsolete
>From fbf71ec25a5986d9003ac16ee9e23675feac9053 Mon Sep 17 00:00:00 2001 >From: Paul Smith <psmith@gnu.org> >Date: Sun, 16 Apr 2017 15:03:48 -0400 >Subject: * configure.ac: [SV 50648] Detect Guile 2.2 packages. > >--- > configure.ac | 26 ++++++++++++++++---------- > 1 file changed, 16 insertions(+), 10 deletions(-) > >Index: make-4.2.1/configure.ac >=================================================================== >--- make-4.2.1.orig/configure.ac >+++ make-4.2.1/configure.ac >@@ -160,22 +160,28 @@ AC_FUNC_ALLOCA > AC_FUNC_CLOSEDIR_VOID > > # See if the user wants to add (or not) GNU Guile support >-PKG_PROG_PKG_CONFIG > AC_ARG_WITH([guile], [AS_HELP_STRING([--with-guile], > [Support GNU Guile for embedded scripting])]) > >-# For some strange reason, at least on Ubuntu, each version of Guile >-# comes with it's own PC file so we have to specify them as individual >-# packages. Ugh. >+# Annoyingly, each version of Guile comes with it's own PC file so we have to >+# specify them as individual packages. Ugh. >+PKG_PROG_PKG_CONFIG >+ > AS_IF([test "x$with_guile" != xno], >-[ PKG_CHECK_MODULES([GUILE], [guile-2.0], [have_guile=yes], >- [PKG_CHECK_MODULES([GUILE], [guile-1.8], [have_guile=yes], >- [have_guile=no])]) >+[ guile_versions="2.2 2.0 1.8" >+ guile_version=no >+ have_guile=no >+ AC_MSG_CHECKING([for GNU Guile]) >+ for v in $guile_versions; do >+ PKG_CHECK_EXISTS([guile-$v], [guile_version=$v; have_guile=yes; break], []) >+ done >+ AC_MSG_RESULT([$guile_version]) >+ if test "$have_guile" = yes; then >+ PKG_CHECK_MODULES(GUILE, [guile-$guile_version]) >+ AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support]) >+ fi > ]) > >-AS_IF([test "$have_guile" = yes], >- [AC_DEFINE([HAVE_GUILE], [1], [Embed GNU Guile support])]) >- > AM_CONDITIONAL([HAVE_GUILE], [test "$have_guile" = yes]) > > AC_FUNC_GETLOADAVG >Index: make-4.2.1/configure >=================================================================== >--- make-4.2.1.orig/configure >+++ make-4.2.1/configure >@@ -745,7 +745,6 @@ infodir > docdir > oldincludedir > includedir >-runstatedir > localstatedir > sharedstatedir > sysconfdir >@@ -835,7 +834,6 @@ datadir='${datarootdir}' > sysconfdir='${prefix}/etc' > sharedstatedir='${prefix}/com' > localstatedir='${prefix}/var' >-runstatedir='${localstatedir}/run' > includedir='${prefix}/include' > oldincludedir='/usr/include' > docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' >@@ -1088,15 +1086,6 @@ do > | -silent | --silent | --silen | --sile | --sil) > silent=yes ;; > >- -runstatedir | --runstatedir | --runstatedi | --runstated \ >- | --runstate | --runstat | --runsta | --runst | --runs \ >- | --run | --ru | --r) >- ac_prev=runstatedir ;; >- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ >- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ >- | --run=* | --ru=* | --r=*) >- runstatedir=$ac_optarg ;; >- > -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) > ac_prev=sbindir ;; > -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ >@@ -1234,7 +1223,7 @@ fi > for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ > datadir sysconfdir sharedstatedir localstatedir includedir \ > oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ >- libdir localedir mandir runstatedir >+ libdir localedir mandir > do > eval ac_val=\$$ac_var > # Remove trailing slashes. >@@ -1387,7 +1376,6 @@ Fine tuning of the installation director > --sysconfdir=DIR read-only single-machine data [PREFIX/etc] > --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] > --localstatedir=DIR modifiable single-machine data [PREFIX/var] >- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] > --libdir=DIR object code libraries [EPREFIX/lib] > --includedir=DIR C header files [PREFIX/include] > --oldincludedir=DIR C header files for non-gcc [/usr/include] >@@ -8043,7 +8031,7 @@ else > We can't simply define LARGE_OFF_T to be 9223372036854775807, > since some C++ compilers masquerading as C compilers > incorrectly reject 9223372036854775807. */ >-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) >+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) > int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 > && LARGE_OFF_T % 2147483647 == 1) > ? 1 : -1]; >@@ -8089,7 +8077,7 @@ else > We can't simply define LARGE_OFF_T to be 9223372036854775807, > since some C++ compilers masquerading as C compilers > incorrectly reject 9223372036854775807. */ >-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) >+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) > int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 > && LARGE_OFF_T % 2147483647 == 1) > ? 1 : -1]; >@@ -8113,7 +8101,7 @@ rm -f core conftest.err conftest.$ac_obj > We can't simply define LARGE_OFF_T to be 9223372036854775807, > since some C++ compilers masquerading as C compilers > incorrectly reject 9223372036854775807. */ >-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) >+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) > int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 > && LARGE_OFF_T % 2147483647 == 1) > ? 1 : -1]; >@@ -8158,7 +8146,7 @@ else > We can't simply define LARGE_OFF_T to be 9223372036854775807, > since some C++ compilers masquerading as C compilers > incorrectly reject 9223372036854775807. */ >-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) >+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) > int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 > && LARGE_OFF_T % 2147483647 == 1) > ? 1 : -1]; >@@ -8182,7 +8170,7 @@ rm -f core conftest.err conftest.$ac_obj > We can't simply define LARGE_OFF_T to be 9223372036854775807, > since some C++ compilers masquerading as C compilers > incorrectly reject 9223372036854775807. */ >-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) >+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) > int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 > && LARGE_OFF_T % 2147483647 == 1) > ? 1 : -1]; >@@ -9694,6 +9682,15 @@ fi > > # See if the user wants to add (or not) GNU Guile support > >+# Check whether --with-guile was given. >+if test "${with_guile+set}" = set; then : >+ withval=$with_guile; >+fi >+ >+ >+# Annoyingly, each version of Guile comes with it's own PC file so we have to >+# specify them as individual packages. Ugh. >+ > > > >@@ -9814,75 +9811,25 @@ $as_echo "no" >&6; } > fi > fi > >-# Check whether --with-guile was given. >-if test "${with_guile+set}" = set; then : >- withval=$with_guile; >-fi >- >- >-# For some strange reason, at least on Ubuntu, each version of Guile >-# comes with it's own PC file so we have to specify them as individual >-# packages. Ugh. > if test "x$with_guile" != xno; then : >- >-pkg_failed=no >-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 >-$as_echo_n "checking for GUILE... " >&6; } >- >-if test -n "$GUILE_CFLAGS"; then >- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" >- elif test -n "$PKG_CONFIG"; then >- if test -n "$PKG_CONFIG" && \ >- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5 >- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5 >- ac_status=$? >- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 >- test $ac_status = 0; }; then >- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-2.0" 2>/dev/null` >- test "x$?" != "x0" && pkg_failed=yes >-else >- pkg_failed=yes >-fi >- else >- pkg_failed=untried >-fi >-if test -n "$GUILE_LIBS"; then >- pkg_cv_GUILE_LIBS="$GUILE_LIBS" >- elif test -n "$PKG_CONFIG"; then >+ guile_versions="2.2 2.0 1.8" >+ guile_version=no >+ have_guile=no >+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU Guile" >&5 >+$as_echo_n "checking for GNU Guile... " >&6; } >+ for v in $guile_versions; do > if test -n "$PKG_CONFIG" && \ >- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-2.0\""; } >&5 >- ($PKG_CONFIG --exists --print-errors "guile-2.0") 2>&5 >+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$v\""; } >&5 >+ ($PKG_CONFIG --exists --print-errors "guile-$v") 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; then >- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-2.0" 2>/dev/null` >- test "x$?" != "x0" && pkg_failed=yes >-else >- pkg_failed=yes >-fi >- else >- pkg_failed=untried >-fi >- >- >- >-if test $pkg_failed = yes; then >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 >-$as_echo "no" >&6; } >- >-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then >- _pkg_short_errors_supported=yes >-else >- _pkg_short_errors_supported=no >+ guile_version=$v; have_guile=yes; break > fi >- if test $_pkg_short_errors_supported = yes; then >- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-2.0" 2>&1` >- else >- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-2.0" 2>&1` >- fi >- # Put the nasty error message in config.log where it belongs >- echo "$GUILE_PKG_ERRORS" >&5 >- >+ done >+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $guile_version" >&5 >+$as_echo "$guile_version" >&6; } >+ if test "$have_guile" = yes; then > > pkg_failed=no > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 >@@ -9892,12 +9839,12 @@ if test -n "$GUILE_CFLAGS"; then > pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" > elif test -n "$PKG_CONFIG"; then > if test -n "$PKG_CONFIG" && \ >- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 >- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 >+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5 >+ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; then >- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null` >+ pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-$guile_version" 2>/dev/null` > test "x$?" != "x0" && pkg_failed=yes > else > pkg_failed=yes >@@ -9909,12 +9856,12 @@ if test -n "$GUILE_LIBS"; then > pkg_cv_GUILE_LIBS="$GUILE_LIBS" > elif test -n "$PKG_CONFIG"; then > if test -n "$PKG_CONFIG" && \ >- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 >- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 >+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-\$guile_version\""; } >&5 >+ ($PKG_CONFIG --exists --print-errors "guile-$guile_version") 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; then >- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null` >+ pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-$guile_version" 2>/dev/null` > test "x$?" != "x0" && pkg_failed=yes > else > pkg_failed=yes >@@ -9935,113 +9882,50 @@ else > _pkg_short_errors_supported=no > fi > if test $_pkg_short_errors_supported = yes; then >- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1` >+ GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-$guile_version" 2>&1` > else >- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1` >+ GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-$guile_version" 2>&1` > fi > # Put the nasty error message in config.log where it belongs > echo "$GUILE_PKG_ERRORS" >&5 > >- have_guile=no >-elif test $pkg_failed = untried; then >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 >-$as_echo "no" >&6; } >- have_guile=no >-else >- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS >- GUILE_LIBS=$pkg_cv_GUILE_LIBS >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 >-$as_echo "yes" >&6; } >- have_guile=yes >-fi >-elif test $pkg_failed = untried; then >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 >-$as_echo "no" >&6; } >+ as_fn_error $? "Package requirements (guile-$guile_version) were not met: > >-pkg_failed=no >-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GUILE" >&5 >-$as_echo_n "checking for GUILE... " >&6; } >- >-if test -n "$GUILE_CFLAGS"; then >- pkg_cv_GUILE_CFLAGS="$GUILE_CFLAGS" >- elif test -n "$PKG_CONFIG"; then >- if test -n "$PKG_CONFIG" && \ >- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 >- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 >- ac_status=$? >- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 >- test $ac_status = 0; }; then >- pkg_cv_GUILE_CFLAGS=`$PKG_CONFIG --cflags "guile-1.8" 2>/dev/null` >- test "x$?" != "x0" && pkg_failed=yes >-else >- pkg_failed=yes >-fi >- else >- pkg_failed=untried >-fi >-if test -n "$GUILE_LIBS"; then >- pkg_cv_GUILE_LIBS="$GUILE_LIBS" >- elif test -n "$PKG_CONFIG"; then >- if test -n "$PKG_CONFIG" && \ >- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"guile-1.8\""; } >&5 >- ($PKG_CONFIG --exists --print-errors "guile-1.8") 2>&5 >- ac_status=$? >- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 >- test $ac_status = 0; }; then >- pkg_cv_GUILE_LIBS=`$PKG_CONFIG --libs "guile-1.8" 2>/dev/null` >- test "x$?" != "x0" && pkg_failed=yes >-else >- pkg_failed=yes >-fi >- else >- pkg_failed=untried >-fi >+$GUILE_PKG_ERRORS > >+Consider adjusting the PKG_CONFIG_PATH environment variable if you >+installed software in a non-standard prefix. > >- >-if test $pkg_failed = yes; then >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 >-$as_echo "no" >&6; } >- >-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then >- _pkg_short_errors_supported=yes >-else >- _pkg_short_errors_supported=no >-fi >- if test $_pkg_short_errors_supported = yes; then >- GUILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "guile-1.8" 2>&1` >- else >- GUILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "guile-1.8" 2>&1` >- fi >- # Put the nasty error message in config.log where it belongs >- echo "$GUILE_PKG_ERRORS" >&5 >- >- have_guile=no >+Alternatively, you may set the environment variables GUILE_CFLAGS >+and GUILE_LIBS to avoid the need to call pkg-config. >+See the pkg-config man page for more details." "$LINENO" 5 > elif test $pkg_failed = untried; then > { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 > $as_echo "no" >&6; } >- have_guile=no >-else >- GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS >- GUILE_LIBS=$pkg_cv_GUILE_LIBS >- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 >-$as_echo "yes" >&6; } >- have_guile=yes >-fi >+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 >+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} >+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it >+is in your PATH or set the PKG_CONFIG environment variable to the full >+path to pkg-config. >+ >+Alternatively, you may set the environment variables GUILE_CFLAGS >+and GUILE_LIBS to avoid the need to call pkg-config. >+See the pkg-config man page for more details. >+ >+To get pkg-config, see <http://pkg-config.freedesktop.org/>. >+See \`config.log' for more details" "$LINENO" 5; } > else > GUILE_CFLAGS=$pkg_cv_GUILE_CFLAGS > GUILE_LIBS=$pkg_cv_GUILE_LIBS > { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 > $as_echo "yes" >&6; } >- have_guile=yes >-fi > > fi > >-if test "$have_guile" = yes; then : >- > $as_echo "#define HAVE_GUILE 1" >>confdefs.h > >+ fi >+ > fi > > if test "$have_guile" = yes; then
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 650608
: 524092