OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Apr-2005 19:02:39
Branch: HEAD Handle: 2005042018023900
Modified files:
openpkg-src/pkgconfig pkgconfig.patch pkgconfig.spec
Log:
introduce patch logic to add a new command line argument '--shared',
the functional counterpart of the recently added '--static' argument
Summary:
Revision Changes Path
1.2 +45 -3 openpkg-src/pkgconfig/pkgconfig.patch
1.27 +1 -1 openpkg-src/pkgconfig/pkgconfig.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pkgconfig/pkgconfig.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 pkgconfig.patch
--- openpkg-src/pkgconfig/pkgconfig.patch 7 Nov 2003 10:53:22 -0000
1.1
+++ openpkg-src/pkgconfig/pkgconfig.patch 20 Apr 2005 17:02:39 -0000
1.2
@@ -1,6 +1,6 @@
-diff -Naur pkgconfig-0.15.0.orig/parse.c pkgconfig-0.15.0/parse.c
---- pkgconfig-0.15.0.orig/parse.c Fri Nov 7 10:55:19 2003
-+++ pkgconfig-0.15.0/parse.c Fri Nov 7 11:37:53 2003
+diff -Nau parse.c.orig parse.c
+--- parse.c.orig Fri Nov 7 10:55:19 2003
++++ parse.c Fri Nov 7 11:37:53 2003
@@ -1239,7 +1239,7 @@
return pkg;
@@ -22,3 +22,45 @@
}
#endif
}
+diff -Nau main.c.orig main.c
+--- main.c.orig 2005-04-12 13:08:13 +0200
++++ main.c 2005-04-20 18:04:10 +0200
+@@ -182,7 +182,8 @@
+ int want_I_cflags = 0;
+ int want_other_cflags = 0;
+ int want_list = 0;
+- int want_static_lib_list = ENABLE_INDIRECT_DEPS;
++ int want_static_lib_list = 0;
++ int want_shared_lib_list = 0;
+ int result;
+ int want_uninstalled = 0;
+ char *variable_name = NULL;
+@@ -217,7 +218,9 @@
+ { "libs", 0, POPT_ARG_NONE, &want_libs, 0,
+ "output all linker flags" },
+ { "static", 0, POPT_ARG_NONE, &want_static_lib_list, 0,
+- "output linker flags for static linking" },
++ "output explicit linker flags for static linking" },
++ { "shared", 0, POPT_ARG_NONE, &want_shared_lib_list, 0,
++ "output implicit linker flags for dynamic linking" },
+ { "libs-only-l", 0, POPT_ARG_NONE, &want_l_libs, 0,
+ "output -l flags" },
+ { "libs-only-other", 0, POPT_ARG_NONE, &want_other_libs, 0,
+@@ -592,6 +595,17 @@
+ need_newline = TRUE;
+ }
+
++ /*************************************************************************
++ * if user explicitly specified only --static, then recurse. *
++ * if user explicitly specified both --static and --shared, then recurse. *
++ * *
++ * ...but if user did not explicitly specify either argument, then *
++ * obey the default logic as defined by ENABLE_INDIRECT_DEPS (as set *
++ * by the configure script with the --enable-indirect-deps argument). *
++ *************************************************************************/
++ if (!want_static_lib_list && !want_shared_lib_list)
++ want_static_lib_list = ENABLE_INDIRECT_DEPS;
++
+ if (want_l_libs)
+ {
+ char *str = packages_get_l_libs (packages, want_static_lib_list);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pkgconfig/pkgconfig.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 pkgconfig.spec
--- openpkg-src/pkgconfig/pkgconfig.spec 20 Apr 2005 15:22:53 -0000
1.26
+++ openpkg-src/pkgconfig/pkgconfig.spec 20 Apr 2005 17:02:39 -0000
1.27
@@ -61,7 +61,7 @@
%prep
%setup -q
- %patch -p1
+ %patch -p0
%build
case "%{l_platform -t}" in
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
