kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changes 0.25:

Browse source 
* 0.24 included a too strict whitespace/shell metacharacter filter
  leading to some legal characters like = and : being escaped in the
  output.  This has been fixed.
* when building with newer and external libpopt, it would be confused
  over being asked to split an empty string, leading to errors with
  packages that included empty fields in their .pc files.
* Make the COPYING file explicitly GPLv2.  The COPYING file in 0.24
  was inadvertently GPLv3 rather than the correct GPLv2.
* Minor changes to documentation

Changes 0.24:
* Fix up bug in PKG_CONFIG_SYSROOT handling which mangled non-I and
  non-L arguments
* Put /usr/lib/pkgconfig and /usr/share/pkgconfig into the default
  search path when no prefix is passed to configure.
* Portability fixes for Windows and NetBSD
* Various man page updates
* Add logging support to log how pkg-config is being called.
* Skip Requires.private unless we need them for Cflags
* Add a variable, pc_path to the compiled-in pkg-config package that
  you can query for the compiled-in PKG_CONFIG_PC_PATH.
* Various updates to pkg.m4.
* Update rpmvercmp with bugfixes from upstream.
* Add introductory guide to pkg-config, thanks to Dan Nicholson for
  the patch.
* Add listing of variables in a package
* Make it possible to use external popt.
* Add --print-provides and --print-requires(-private) options
* Add support for paths containing whitespace and shell metacharacters
This commit is contained in:
adam 2010-09-23 07:07:46 +00:00
parent 0fef265759
commit 4545efde3d
13 changed files with 207 additions and 623 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
devel/pkg-config/Makefile
View file

@ -1,8 +1,6 @@
# $NetBSD: Makefile,v 1.16 2010/01/16 19:27:18 heinz Exp $
#
# $NetBSD: Makefile,v 1.17 2010/09/23 07:07:46 adam Exp $
DISTNAME= pkg-config-0.23
PKGREVISION= 1
DISTNAME= pkg-config-0.25
CATEGORIES= devel
MASTER_SITES= http://pkgconfig.freedesktop.org/releases/
@ -14,8 +12,8 @@ LICENSE= gnu-gpl-v2
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-threads
# old name of the package

3
devel/pkg-config/PLIST
View file

@ -1,4 +1,5 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/21 16:22:42 wiz Exp $
@comment $NetBSD: PLIST,v 1.2 2010/09/23 07:07:46 adam Exp $
bin/pkg-config
man/man1/pkg-config.1
share/aclocal/pkg.m4
share/doc/pkg-config/pkg-config-guide.html

23
devel/pkg-config/distinfo
View file

@ -1,16 +1,11 @@
$NetBSD: distinfo,v 1.15 2010/07/18 13:05:07 obache Exp $
$NetBSD: distinfo,v 1.16 2010/09/23 07:07:46 adam Exp $
SHA1 (pkg-config-0.23.tar.gz) = b59dddd6b5320bd74c0f74b3339618a327096b2a
RMD160 (pkg-config-0.23.tar.gz) = 0aa5565430d609319917ac2c8ffeaa5e4a509489
Size (pkg-config-0.23.tar.gz) = 1032839 bytes
SHA1 (patch-ab) = 341bf28ed435314856e1c7cecab3d6d5f232aea7
SHA1 (patch-ac) = 65954b5f1d6608e2546602b1a4bc7c75db683238
SHA1 (patch-ad) = 4628f5ce73b3dcaa2df92e3be2fd7955ab38ffa4
SHA1 (patch-ah) = 3cee7ec1a5592e2a550f74a3eb8da2a9e3ab1773
SHA1 (patch-ca) = 22690d923ddf0e1ce2ca9eddb56ada385f6cefe4
SHA1 (pkg-config-0.25.tar.gz) = 8922aeb4edeff7ed554cc1969cbb4ad5a4e6b26e
RMD160 (pkg-config-0.25.tar.gz) = 835509d01f68c45823ee89c718776eb66f61316b
Size (pkg-config-0.25.tar.gz) = 988899 bytes
SHA1 (patch-ab) = bb7f25365032d424dd6299254c96dce9995148fa
SHA1 (patch-ac) = 567c7c7dba33253263de81818178d7cebcce8645
SHA1 (patch-ad) = a9c162409c2bbb4e016855ddc691e03d7a3197cb
SHA1 (patch-ah) = 2a19dc53da8c0c611bf47f410862f7d30a06a344
SHA1 (patch-ca) = ab435d31c97a487baab8d82638b9d36ec520cf58
SHA1 (patch-cb) = 23412858615649c8d8305ce4e6571f06e17073fd
SHA1 (patch-da) = 44d9810e2eed8dd38339418e6886add289ae504e
SHA1 (patch-db) = 279708087c2740af812c123c880e4dde1402af4c
SHA1 (patch-dc) = 27a8009eb6822608f3869bd71e5cb108edf4063a
SHA1 (patch-dd) = d776d0e6a2907d629f8b6abc68b6f9fb23a9fc61
SHA1 (patch-de) = 67c85c7076b2b624b7221f569ce755d6a6329a0d

68
devel/pkg-config/patches/patch-ab
View file

@ -1,62 +1,10 @@
$NetBSD: patch-ab,v 1.5 2008/03/04 09:22:27 wiz Exp $
The static variables are needed because they are used in a struct
initializer. The IRIX/mipseb C compiler needs those addresses to be
constant.
$NetBSD: patch-ab,v 1.6 2010/09/23 07:07:47 adam Exp $
Log all pkg-config calls to a file. Used by pkgtools/verifypc.
--- main.c.orig 2008-01-16 22:06:48.000000000 +0000
--- main.c.orig 2010-05-10 17:58:57.000000000 +0000
+++ main.c
@@ -173,27 +173,27 @@ pkg_uninstalled (Package *pkg)
int
main (int argc, char **argv)
{
- int want_my_version = 0;
- int want_version = 0;
- int want_libs = 0;
- int want_cflags = 0;
- int want_l_libs = 0;
- int want_L_libs = 0;
- int want_other_libs = 0;
- int want_I_cflags = 0;
- int want_other_cflags = 0;
- int want_list = 0;
- int want_static_lib_list = ENABLE_INDIRECT_DEPS;
- int want_short_errors = 0;
+ static int want_my_version = 0;
+ static int want_version = 0;
+ static int want_libs = 0;
+ static int want_cflags = 0;
+ static int want_l_libs = 0;
+ static int want_L_libs = 0;
+ static int want_other_libs = 0;
+ static int want_I_cflags = 0;
+ static int want_other_cflags = 0;
+ static int want_list = 0;
+ static int want_static_lib_list = ENABLE_INDIRECT_DEPS;
+ static int want_short_errors = 0;
int result;
- int want_uninstalled = 0;
- char *variable_name = NULL;
- int want_exists = 0;
- char *required_atleast_version = NULL;
- char *required_exact_version = NULL;
- char *required_max_version = NULL;
- char *required_pkgconfig_version = NULL;
- int want_silence_errors = 0;
+ static int want_uninstalled = 0;
+ static char *variable_name = NULL;
+ static int want_exists = 0;
+ static char *required_atleast_version = NULL;
+ static char *required_exact_version = NULL;
+ static char *required_max_version = NULL;
+ static char *required_pkgconfig_version = NULL;
+ static int want_silence_errors = 0;
GString *str;
GSList *packages = NULL;
char *search_path;
@@ -472,12 +472,27 @@ main (int argc, char **argv)
@@ -462,12 +462,27 @@ main (int argc, char **argv)
gboolean failed = FALSE;
GSList *reqs;
GSList *iter;
@ -84,9 +32,9 @@ Log all pkg-config calls to a file. Used by pkgtools/verifypc.
while (iter != NULL)
{
Package *req;
@@ -488,6 +503,18 @@ main (int argc, char **argv)
else
req = get_package (ver->name);
@@ -489,6 +504,18 @@ main (int argc, char **argv)
fprintf (log, "\n");
}
+ if (log != NULL)
+ {
@ -103,8 +51,8 @@ Log all pkg-config calls to a file. Used by pkgtools/verifypc.
if (req == NULL)
{
failed = TRUE;
@@ -518,6 +545,11 @@ main (int argc, char **argv)
iter = g_slist_next (iter);
@@ -524,6 +551,11 @@ main (int argc, char **argv)
fclose (log);
}
+ if (log != NULL)

12
devel/pkg-config/patches/patch-ac
View file

@ -1,15 +1,15 @@
$NetBSD: patch-ac,v 1.3 2008/03/04 09:22:27 wiz Exp $
$NetBSD: patch-ac,v 1.4 2010/09/23 07:07:47 adam Exp $
Arbitrary strings should not be passed to "eval".
--- configure.orig 2008-01-16 22:52:31.000000000 +0000
--- configure.orig 2010-05-28 15:55:57.000000000 +0000
+++ configure
@@ -20150,7 +20150,7 @@ echo use_indirect_deps=$use_indirect_dep
echo $ECHO_N "checking whether to list both direct and indirect dependencies... $ECHO_C" >&6; }
@@ -11167,7 +11167,7 @@ echo use_indirect_deps=$use_indirect_dep
$as_echo_n "checking whether to list both direct and indirect dependencies... " >&6; }
case $use_indirect_deps in
auto)
- deplibs_check_method=`(./libtool --config; echo eval echo \$deplibs_check_method) | sh`
+ deplibs_check_method=`(./libtool --config; echo 'echo "$deplibs_check_method"') | sh`
- deplibs_check_method=`(./libtool --config; echo eval echo '\"$deplibs_check_method\"') | sh`
+ deplibs_check_method=`(./libtool --config; echo '\"$deplibs_check_method\"') | sh`
if test "X$deplibs_check_method" = Xnone; then
echo "foo: $deplibs_check_method" >&5
use_indirect_deps=yes

12
devel/pkg-config/patches/patch-ad
View file

@ -1,15 +1,15 @@
$NetBSD: patch-ad,v 1.3 2008/03/04 09:22:27 wiz Exp $
$NetBSD: patch-ad,v 1.4 2010/09/23 07:07:47 adam Exp $
see patch-ac.
See patch-ac.
--- configure.in.orig 2008-01-16 22:48:07.000000000 +0000
--- configure.in.orig 2010-05-28 15:55:09.000000000 +0000
+++ configure.in
@@ -41,7 +41,7 @@ echo use_indirect_deps=$use_indirect_dep
@@ -50,7 +50,7 @@ echo use_indirect_deps=$use_indirect_dep
AC_MSG_CHECKING([whether to list both direct and indirect dependencies])
case $use_indirect_deps in
auto)
- deplibs_check_method=`(./libtool --config; echo eval echo \$deplibs_check_method) | sh`
+ deplibs_check_method=`(./libtool --config; echo 'echo "$deplibs_check_method"') | sh`
- deplibs_check_method=`(./libtool --config; echo eval echo '\"$deplibs_check_method\"') | sh`
+ deplibs_check_method=`(./libtool --config; echo '\"$deplibs_check_method\"') | sh`
if test "X$deplibs_check_method" = Xnone; then
echo "foo: $deplibs_check_method" >&AS_MESSAGE_LOG_FD
use_indirect_deps=yes

6
devel/pkg-config/patches/patch-ah
View file

@ -1,11 +1,11 @@
$NetBSD: patch-ah,v 1.3 2008/03/04 09:22:27 wiz Exp $
$NetBSD: patch-ah,v 1.4 2010/09/23 07:07:47 adam Exp $
Don't call gnome-config, it has been dead for ages and the warnings
just confuse users.
--- parse.c.orig 2008-01-16 20:42:49.000000000 +0000
--- parse.c.orig 2010-05-27 20:21:36.000000000 +0000
+++ parse.c
@@ -1418,102 +1418,8 @@ get_compat_package (const char *name)
@@ -1460,102 +1460,8 @@ get_compat_package (const char *name)
}
else
{

611
devel/pkg-config/patches/patch-ca
View file

@ -1,358 +1,191 @@
$NetBSD: patch-ca,v 1.3 2008/03/04 09:22:27 wiz Exp $
$NetBSD: patch-ca,v 1.4 2010/09/23 07:07:47 adam Exp $
--- glib-1.2.10/configure.orig 2008-01-16 22:52:28.000000000 +0000
--- glib-1.2.10/configure.orig 2010-09-23 06:52:13.000000000 +0000
+++ glib-1.2.10/configure
@@ -20561,119 +20561,6 @@ if test "x$GCC" = "xyes"; then
@@ -12186,61 +12186,6 @@ if test "x$GCC" = "xyes"; then
fi
fi
-{ echo "$as_me:$LINENO: checking for extra flags to get ANSI library prototypes" >&5
-echo $ECHO_N "checking for extra flags to get ANSI library prototypes... $ECHO_C" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags to get ANSI library prototypes" >&5
-$as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; }
-glib_save_LIBS=$LIBS
-LIBS="$LIBS -lm"
-if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <math.h>
- int main (void) { return (log(1) != log(1.)); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; }
-if ac_fn_c_try_run "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; }
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-glib_save_CFLAGS=$CFLAGS
- glib_save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -std1"
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <math.h>
- int main (void) { return (log(1) != log(1.)); }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- { echo "$as_me:$LINENO: result: -std1" >&5
-echo "${ECHO_T}-std1" >&6; }
-if ac_fn_c_try_run "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: -std1" >&5
-$as_echo "-std1" >&6; }
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
-$as_echo "" >&6; }
- CFLAGS=$glib_save_CFLAGS
- { echo "$as_me:$LINENO: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5
-echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5
-$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;}
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-LIBS=$glib_save_LIBS
-
{ echo "$as_me:$LINENO: checking for extra flags for POSIX compliance" >&5
echo $ECHO_N "checking for extra flags for POSIX compliance... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
@@ -23768,14 +23655,7 @@ if test "${glib_cv_has__inline+set}" = s
echo $ECHO_N "(cached) $ECHO_C" >&6
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags for POSIX compliance" >&5
$as_echo_n "checking for extra flags for POSIX compliance... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12726,30 +12671,18 @@ if test "${glib_cv_has__inline+set}" = s
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -23786,41 +23666,33 @@ cat >>conftest.$ac_ext <<_ACEOF
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
__inline int foo () { return 0; }
int main () { return foo (); }
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
glib_cv_has__inline=yes
-
+ glib_cv_has__inline=no
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-glib_cv_has__inline=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-else
- glib_cv_has__inline=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+ glib_cv_has__inline=no
fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -23838,14 +23710,7 @@ if test "${glib_cv_has__inline__+set}" =
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12765,30 +12698,18 @@ if test "${glib_cv_has__inline__+set}" =
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -23856,41 +23721,33 @@ cat >>conftest.$ac_ext <<_ACEOF
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
__inline__ int foo () { return 0; }
int main () { return foo (); }
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
glib_cv_has__inline__=yes
-
+ glib_cv_has__inline__=no
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-glib_cv_has__inline__=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-else
- glib_cv_has__inline__=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+ glib_cv_has__inline__=no
fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -23908,14 +23765,7 @@ if test "${glib_cv_hasinline+set}" = set
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12804,30 +12725,18 @@ if test "${glib_cv_hasinline+set}" = set
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -23926,41 +23776,33 @@ cat >>conftest.$ac_ext <<_ACEOF
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
inline int foo () { return 0; }
int main () { return foo (); }
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-if ac_fn_c_try_run "$LINENO"; then :
- glib_cv_hasinline=yes
-
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-else
- glib_cv_hasinline=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+if ac_fn_c_try_compile "$LINENO"; then :
+ glib_cv_has_inline=yes
+ glib_cv_has_inline=no
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-glib_cv_hasinline=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -26402,14 +26244,7 @@ if test "${glib_cv_va_copy+set}" = set;
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13541,13 +13450,7 @@ if test "${glib_cv_va_copy+set}" = set;
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -26425,46 +26260,41 @@ cat >>conftest.$ac_ext <<_ACEOF
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
@@ -13559,22 +13462,21 @@ else
exit (1);
va_end (args1); va_end (args2);
}
@ -369,74 +202,38 @@ $NetBSD: patch-ca,v 1.3 2008/03/04 09:22:27 wiz Exp $
+ return 0;
+}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
glib_cv_va_copy=yes
-
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-glib_cv_va_copy=no
glib_cv_va_copy=no
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ glib_cv_va_copy=no
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -26476,14 +26306,7 @@ if test "${glib_cv___va_copy+set}" = set
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13586,13 +13488,7 @@ if test "${glib_cv___va_copy+set}" = set
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -26499,46 +26322,41 @@ cat >>conftest.$ac_ext <<_ACEOF
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
@@ -13604,22 +13500,21 @@ else
exit (1);
va_end (args1); va_end (args2);
}
@ -444,84 +241,49 @@ $NetBSD: patch-ca,v 1.3 2008/03/04 09:22:27 wiz Exp $
- f (0, 42);
- return 0;
- }
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- glib_cv___va_copy=yes
-
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ glib_cv_va___copy=yes
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-glib_cv___va_copy=no
-
+ glib_cv_va___copy=no
-else
- glib_cv___va_copy=no
+int
+main ()
+{
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ glib_cv_va___copy=yes
+else
+ glib_cv_va___copy=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -26550,14 +26368,7 @@ if test "${glib_cv_va_val_copy+set}" = s
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13631,13 +13526,7 @@ if test "${glib_cv_va_val_copy+set}" = s
$as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -26573,46 +26384,41 @@ cat >>conftest.$ac_ext <<_ACEOF
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
@@ -13649,22 +13538,21 @@ else
exit (1);
va_end (args1); va_end (args2);
}
@ -538,58 +300,23 @@ $NetBSD: patch-ca,v 1.3 2008/03/04 09:22:27 wiz Exp $
+ return 0;
+}
_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"; then :
glib_cv_va_val_copy=yes
-
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-( exit $ac_status )
-glib_cv_va_val_copy=no
glib_cv_va_val_copy=no
-
+ glib_cv_va_val_copy=no
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@@ -29031,6 +28837,15 @@ _ACEOF
@@ -14910,6 +14798,15 @@ _ACEOF
@ -605,7 +332,7 @@ $NetBSD: patch-ca,v 1.3 2008/03/04 09:22:27 wiz Exp $
glib_sysdefso="glibconfig-sysdefs.h"
glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ ]*//g'`
if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
@@ -29124,7 +28939,7 @@ fi
@@ -14974,7 +14871,7 @@ fi
rm -f confrun.c

17
devel/pkg-config/patches/patch-da
View file

@ -1,17 +0,0 @@
$NetBSD: patch-da,v 1.1 2010/07/18 13:05:07 obache Exp $
--- Makefile.in.orig 2008-01-16 22:52:30.000000000 +0000
+++ Makefile.in
@@ -209,10 +209,10 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/poptparse.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(pkg_config_SOURCES)

17
devel/pkg-config/patches/patch-db
View file

@ -1,17 +0,0 @@
$NetBSD: patch-db,v 1.1 2010/07/18 13:05:07 obache Exp $
--- glib-1.2.10/gmodule/Makefile.in.orig 2008-01-16 22:52:27.000000000 +0000
+++ glib-1.2.10/gmodule/Makefile.in
@@ -239,10 +239,10 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/testgmodule.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(libgmodule_la_SOURCES) $(libgplugin_a_la_SOURCES) \
$(libgplugin_b_la_SOURCES) testgmodule.c

17
devel/pkg-config/patches/patch-dc
View file

@ -1,17 +0,0 @@
$NetBSD: patch-dc,v 1.1 2010/07/18 13:05:07 obache Exp $
--- glib-1.2.10/gthread/Makefile.in.orig 2008-01-16 22:52:27.000000000 +0000
+++ glib-1.2.10/gthread/Makefile.in
@@ -210,10 +210,10 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/testgthread.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(libgthread_la_SOURCES) testgthread.c
DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am

17
devel/pkg-config/patches/patch-dd
View file

@ -1,17 +0,0 @@
$NetBSD: patch-dd,v 1.1 2010/07/18 13:05:07 obache Exp $
--- glib-1.2.10/Makefile.in.orig 2008-01-16 22:52:26.000000000 +0000
+++ glib-1.2.10/Makefile.in
@@ -305,10 +305,10 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/testglib.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(libglib_la_SOURCES) testgdate.c testgdateparser.c \
testglib.c

17
devel/pkg-config/patches/patch-de
View file

@ -1,17 +0,0 @@
$NetBSD: patch-de,v 1.1 2010/07/18 13:05:07 obache Exp $
--- glib-1.2.10/tests/Makefile.in.orig 2008-01-16 22:52:27.000000000 +0000
+++ glib-1.2.10/tests/Makefile.in
@@ -266,10 +266,10 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/type-test.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = array-test.c dirname-test.c hash-test.c list-test.c \
node-test.c relation-test.c slist-test.c strfunc-test.c \