Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/devel
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29618/10.3/unstable/main/finkinfo/devel
Modified Files:
pkgconfig.info pkgconfig.patch
Log Message:
New version, tweaked to be compatible with old version.
Index: pkgconfig.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/devel/pkgconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pkgconfig.patch 4 Jun 2005 05:02:48 -0000 1.2
+++ pkgconfig.patch 15 Jun 2006 17:07:32 -0000 1.3
@@ -1,16 +1,38 @@
-diff -Naur pkgconfig-0.17.2.orig/configure pkgconfig-0.17.2/configure
---- pkgconfig-0.17.2.orig/configure 2005-04-14 04:33:18.000000000 -0400
-+++ pkgconfig-0.17.2/configure 2005-06-04 00:33:43.000000000 -0400
-@@ -463,7 +463,7 @@
+diff -Nurd -x'*~' pkg-config-0.20.orig/Makefile.in pkg-config-0.20/Makefile.in
+--- pkg-config-0.20.orig/Makefile.in 2005-10-16 13:45:32.000000000 -0400
++++ pkg-config-0.20/Makefile.in 2006-03-17 12:40:46.000000000 -0500
+@@ -144,6 +144,7 @@
+ @[EMAIL PROTECTED] = glib-1.2.8/libglib.la
+ @[EMAIL PROTECTED] = @GLIB_LIBS@
+ @[EMAIL PROTECTED] = glib-1.2.8 check
[EMAIL PROTECTED]@SUBDIRS = check
+
+ m4dir = $(datadir)/aclocal
+ m4_DATA = pkg.m4
+diff -Nurd -x'*~' pkg-config-0.20.orig/check/Makefile.in
pkg-config-0.20/check/Makefile.in
+--- pkg-config-0.20.orig/check/Makefile.in 2005-10-16 13:45:40.000000000
-0400
++++ pkg-config-0.20/check/Makefile.in 2006-06-15 12:56:06.000000000 -0400
+@@ -141,7 +141,7 @@
+ target_alias = @target_alias@
+
+ TESTS = check-cflags check-libs check-define-variable \
+- check-libs-private check-requires-private check-includedir
++ check-libs-private check-includedir
+
+
+ EXTRA_DIST = $(TESTS) common simple.pc requires-test.pc public-dep.pc \
+diff -Nurd -x'*~' pkg-config-0.20.orig/configure pkg-config-0.20/configure
+--- pkg-config-0.20.orig/configure 2005-10-16 13:45:33.000000000 -0400
++++ pkg-config-0.20/configure 2006-03-17 12:40:46.000000000 -0500
+@@ -463,7 +463,6 @@
# include <unistd.h>
#endif"
-ac_subdirs_all="$ac_subdirs_all glib-1.2.8"
-+ac_subdirs_all="$ac_subdirs_all"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL
AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP
INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE
am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB
ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77
LIBTOOL pc_path USE_INSTALLED_GLIB_TRUE USE_INSTALLED_GLIB_FALSE GLIB_LIBS
GLIB_CFLAGS subdirs ALLOCA LIBOBJS LTLIBOBJS'
ac_subst_files=''
-@@ -19928,13 +19928,13 @@
+@@ -19928,13 +19927,13 @@
@@ -29,12 +51,13 @@
case "$libdir" in
-@@ -19988,7 +19989,7 @@
+@@ -19988,7 +19987,8 @@
else
-subdirs="$subdirs glib-1.2.8"
-+subdirs="$subdirs"
++GLIB_CFLAGS='`${bindir}/glib-config --cflags`'
++GLIB_LIBS='`${bindir}/glib-config --libs`'
fi # !native_win32
Index: pkgconfig.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/devel/pkgconfig.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pkgconfig.info 5 Jun 2005 21:35:38 -0000 1.5
+++ pkgconfig.info 15 Jun 2006 17:07:32 -0000 1.6
@@ -1,19 +1,25 @@
Package: pkgconfig
-Version: 0.17.2
-Revision: 2
-Source: mirror:gnome:sources/%n/0.17/%n-%v.tar.bz2
-Source-MD5: eab15aecff99e98bcc5d01331452e583
+Version: 0.20
+Revision: 1
+#Source: mirror:gnome:sources/%n/0.18/%n-%v.tar.bz2
+Source: http://pkgconfig.freedesktop.org/releases/pkg-config-%v.tar.gz
+Source-MD5: fb42402593e4198bc252ab248dd4158b
+SourceDirectory: pkg-config-%v
Depends: glib-shlibs (>= 1.2.8)
BuildDepends: glib (>= 1.2.8)
Patch: %n.patch
PatchScript: <<
mv glib-1.2.8 glib-1.2.8_UNUSED
<<
-SetCPPFLAGS: -no-cpp-precomp -I%p/include/glib-1.2 -I%p/lib/glib/include
+SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -fstrict-aliasing -funroll-loops
-SetLDFLAGS: -lglib
-ConfigureParams: --mandir=%p/share/man
--with-pc-path=/usr/X11R6/lib/pkgconfig:%p/lib/pkgconfig
--disable-dependency-tracking --enable-indirect-deps
-CompileScript: ./configure %c; make -j2
+ConfigureParams: --mandir=%p/share/man
--with-pc-path=/usr/X11R6/lib/pkgconfig:%p/lib/pkgconfig
--disable-dependency-tracking
+# --enable-indirect-deps
+CompileScript: <<
+ ./configure %c
+ make
+ make check
+<<
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Description: Manager for library compile/link flags
@@ -21,6 +27,13 @@
pkg-config is a script to make putting together all the build
flags when compiling/linking a lot easier.
<<
+DescUsage: <<
+Version 0.20 adds support for *.private fields in .pc files. Older
+versions ignore them and most fink packages that use pkg-config do not
+need them. However, packages supplying .pc that have them should take
+steps to ensure users who might need them don't accidentally use a
+lower version of pkgconfig and thus get deficient flags.
+<<
DescPort: <<
X11 provides some .pc files in /usr/X11R6/lib/pkgconfig, so this
directory was added to default search path.
@@ -33,10 +46,20 @@
Starting with 0.17.2, Link to Fink's glib pkg instead of static-link
to included glib-1.2.8 since we have newer and better-OSX-tweaked
glib than that now.
+
+ Omitting --enable-indirect-deps gives a binary that gives identical
+ results for --libs and --cflags for the fink-supplied pkgconfig/*.pc
+ collection as 0.17.2-2 (with --enable-indirect-deps), including ones
+ that have Requires and ones that have .private fields. The binary
+ still fails some tests (appears to do depth-first recursing through
+ Requires but expects breadth-first), so we disable those.
+
+ Upstream seems rather disinterested in solving this self-test mess.
+ See: https://bugs.freedesktop.org/show_bug.cgi?id=3809
<<
License: GPL
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
DescPackaging: <<
Originally packaged by Masanori Sekino (until 0.15.0).
<<
-Homepage: http://www.freedesktop.org/software/pkgconfig/
+Homepage: http://pkgconfig.freedesktop.org/wiki
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
