diff options
author | wiz <wiz> | 2005-07-21 16:22:42 +0000 |
---|---|---|
committer | wiz <wiz> | 2005-07-21 16:22:42 +0000 |
commit | cf5542e2f44ded1ecdd5c5065464f162d2755562 (patch) | |
tree | dfc554ba8a6b49ca0227389a503166a5a74ac9ca /devel | |
parent | 6a5e99112e983208793b07c895ebdfa9db594dec (diff) | |
download | pkgsrc-cf5542e2f44ded1ecdd5c5065464f162d2755562.tar.gz |
Import pkg-config-0.19, updated version of devel/pkgconfig.
News:
2005-07-16 Tollef Fog Heen
* configure.in: Release 0.19
2005-07-15 Tollef Fog Heen
* pkg.c (package_get_var): Make sure to g_strdup all the return
values and not return some values which should not be freed and
some which should. Yay valgrind. Freedesktop #3682
* configure.in: Fix default search path to be pkgconfig rather
than pkg-config again. Freedesktop #3662
* pkg.m4: Add a missing AC_MSG_RESULT. Thanks to Gary Kramlich
for noticing this and harassing me to fix it.
2005-06-29 Tollef Fog Heen
* configure.in: Release 0.18.1
* pkg.m4: Brown bag fix. pkg_failed was always set to “untried”.
Debian #316181.
2005-06-27 Tollef Fog Heen
* configure.in: Rename to pkg-config.
pkg-config 0.18
The inter-library dependencies check was too tight and caused
problems if one used the --no-undefined flag to libtool on Solaris
(since it there expands to -Wl,-z,defs which disallows undefined
symbols). Add a new name to .pc files: Libs.private which will
not be listed in the output of --libs unless --static is also
given.
Private libraries are libraries which are needed in the case of
static linking or on platforms not supporting inter-library
dependencies. They are not supposed to be used for libraries
which are exposed through the library in question. An example of
an exposed library is GTK+ exposing Glib. A common example of a
private library is libm.
Generally, if include another library's headers in your own, it's
a public dependency and not a private one.
Thanks a lot to James Henstridge for both the bug and the following
discussion.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/pkg-config/DESCR | 6 | ||||
-rw-r--r-- | devel/pkg-config/Makefile | 33 | ||||
-rw-r--r-- | devel/pkg-config/PLIST | 4 | ||||
-rw-r--r-- | devel/pkg-config/buildlink3.mk | 26 | ||||
-rw-r--r-- | devel/pkg-config/distinfo | 6 | ||||
-rw-r--r-- | devel/pkg-config/patches/patch-aa | 54 |
6 files changed, 129 insertions, 0 deletions
diff --git a/devel/pkg-config/DESCR b/devel/pkg-config/DESCR new file mode 100644 index 00000000000..2ae2da81b16 --- /dev/null +++ b/devel/pkg-config/DESCR @@ -0,0 +1,6 @@ +pkg-config is a system for managing library compile/link flags that +works with automake and autoconf. It replaces the ubiquitous +*-config scripts you may have seen with a single tool. + +Despite its name, this project is not related to the NetBSD package +system! diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile new file mode 100644 index 00000000000..d39477042c0 --- /dev/null +++ b/devel/pkg-config/Makefile @@ -0,0 +1,33 @@ +# $NetBSD: Makefile,v 1.1.1.1 2005/07/21 16:22:42 wiz Exp $ +# + +DISTNAME= pkg-config-0.19 +CATEGORIES= devel +MASTER_SITES= http://pkgconfig.freedesktop.org/releases/ + +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://pkgconfig.freedesktop.org/ +COMMENT= System for managing library compile/link flags + +PKG_INSTALLATION_TYPES= overwrite pkgviews + +GNU_CONFIGURE= YES +USE_LIBTOOL= YES +CONFIGURE_ARGS+= --disable-threads + +# old name of the package +CONFLICTS= pkgconfig-[0-9]* + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "IRIX" +# configure bails out in subdir after re-parsing the cache +CONFIGURE_ARGS+= --cache-file=/dev/null +.endif + +# needed for fifth test case +BUILDLINK_PASSTHRU_DIRS= /private-dep /public-dep /requires-test +TEST_TARGET= check + +.include "../../mk/dlopen.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/pkg-config/PLIST b/devel/pkg-config/PLIST new file mode 100644 index 00000000000..765d08ab98b --- /dev/null +++ b/devel/pkg-config/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2005/07/21 16:22:42 wiz Exp $ +bin/pkg-config +man/man1/pkg-config.1 +share/aclocal/pkg.m4 diff --git a/devel/pkg-config/buildlink3.mk b/devel/pkg-config/buildlink3.mk new file mode 100644 index 00000000000..7b3b6d58b55 --- /dev/null +++ b/devel/pkg-config/buildlink3.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/07/21 16:22:42 wiz Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +PKG_CONFIG_BUILDLINK3_MK:= ${PKG_CONFIG_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= pkg-config +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npkg-config} +BUILDLINK_PACKAGES+= pkg-config + +.if !empty(PKG_CONFIG_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.pkg-config+= pkg-config>=0.15.0 +BUILDLINK_PKGSRCDIR.pkg-config?= ../../devel/pkg-config +BUILDLINK_DEPMETHOD.pkg-config?= build + +PKG_CONFIG_LIBDIR?= ${BUILDLINK_DIR}/lib/pkgconfig +CONFIGURE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkg-config}/bin/pkg-config +CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q} +MAKE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkg-config}/bin/pkg-config +MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q} + +.endif # PKG_CONFIG_BUILDLINK3_MK + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo new file mode 100644 index 00000000000..bbc0fce692f --- /dev/null +++ b/devel/pkg-config/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1 2005/07/21 16:22:42 wiz Exp $ + +SHA1 (pkg-config-0.19.tar.gz) = b09fa43dcc44fe0db8df1c4994a8ff9eab371666 +RMD160 (pkg-config-0.19.tar.gz) = 30355004c09fe947dc3cf8f1159f068924d0d7a2 +Size (pkg-config-0.19.tar.gz) = 968790 bytes +SHA1 (patch-aa) = b07ff0f2a8caaef6d91673c1883f0de9d4d2ae7f diff --git a/devel/pkg-config/patches/patch-aa b/devel/pkg-config/patches/patch-aa new file mode 100644 index 00000000000..3ff827e666b --- /dev/null +++ b/devel/pkg-config/patches/patch-aa @@ -0,0 +1,54 @@ +$NetBSD: patch-aa,v 1.1.1.1 2005/07/21 16:22:43 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. + +--- main.c.orig 2005-05-18 13:52:58.000000000 +0200 ++++ main.c +@@ -172,26 +172,26 @@ 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; ++ 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; + 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; |