Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[7450] trunk/octave-forge/admin/Windows/mingw32
|
From: <lin...@us...> - 2010-06-21 13:07:14
|
Revision: 7450
http://octave.svn.sourceforge.net/octave/?rev=7450&view=rev
Author: lindnerb
Date: 2010-06-21 13:07:08 +0000 (Mon, 21 Jun 2010)
Log Message:
-----------
mingw32 (gcc-4.5.0): add glib/pkg-config
Modified Paths:
--------------
trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh
Added Paths:
-----------
trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh
trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh
trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch
Modified: trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh
===================================================================
--- trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-21 13:05:10 UTC (rev 7449)
+++ trunk/octave-forge/admin/Windows/mingw32/gcc45_build_deps.sh 2010-06-21 13:07:08 UTC (rev 7450)
@@ -41,6 +41,8 @@
VER_ICONV=1.13-$REL
VER_GETTEXT=0.17-$REL
+VER_GLIB=2.24.0-$REL
+VER_PKGCONFIG=0.23-$REL
VER_TEXINFO=4.13a-$REL
@@ -96,5 +98,7 @@
( cd iconv && build-${VER_ICONV}.sh ${ACTION} );
( cd gettext && build-${VER_GETTEXT}.sh ${ACTION} );
+( cd glib && build-${VER_GLIB}.sh ${ACTION} );
+( cd pkg-config && build-${VER_PKGCONFIG}.sh ${ACTION} );
( cd texinfo && build-${VER_TEXINFO}.sh ${ACTION} );
Added: trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh
===================================================================
--- trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh (rev 0)
+++ trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh 2010-06-21 13:07:08 UTC (rev 7450)
@@ -0,0 +1,377 @@
+#! /usr/bin/sh
+
+# Name of package
+PKG=glib
+# Version of Package
+VER=2.24.0
+# Release of (this patched) package
+REL=5
+# Name&Version of Package
+PKGVER=${PKG}-${VER}
+# Full name of this patched Package
+FULLPKG=${PKGVER}-${REL}
+
+# Name of source file(s)
+SRCFILE=${PKGVER}.tar.bz2
+# Name of Patch file
+PATCHFILE=${FULLPKG}.patch
+
+# URL(s) of source code file(s)
+URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.24/glib-2.24.0.tar.bz2"
+
+# Top dir of this building process (i.e. where the patch file and source file(s) reside)
+TOPDIR=`pwd`
+# Directory source code is extraced to (relative to TOPDIR)
+SRCDIR=${PKGVER}
+# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR)
+SRCDIR_ORIG=${SRCDIR}-orig
+
+# Make file to use (optional)
+MAKEFILE=
+# Any extra flags to pass make to
+MAKE_XTRA=
+
+# Header files to install
+HEADERS_INSTALL="
+glib/glib.h
+glib/glib-object.h
+gmodule/gmodule.h"
+
+HEADERS_GLIB="
+galloca.h
+garray.h
+gasyncqueue.h
+gatomic.h
+gbacktrace.h
+gbase64.h
+gbitlock.h
+gbookmarkfile.h
+gcache.h
+gchecksum.h
+gcompletion.h
+gconvert.h
+gdataset.h
+gdate.h
+gdir.h
+gerror.h
+gfileutils.h
+ghash.h
+ghook.h
+ghostutils.h
+gi18n.h
+gi18n-lib.h
+giochannel.h
+gkeyfile.h
+glist.h
+gmacros.h
+gmain.h
+gmappedfile.h
+gmarkup.h
+gmem.h
+gmessages.h
+gnode.h
+goption.h
+gpattern.h
+gpoll.h
+gprimes.h
+gqsort.h
+gquark.h
+gqueue.h
+grand.h
+gregex.h
+grel.h
+gscanner.h
+gsequence.h
+gshell.h
+gslice.h
+gslist.h
+gspawn.h
+gstdio.h
+gstrfuncs.h
+gtestutils.h
+gstring.h
+gthread.h
+gthreadpool.h
+gtimer.h
+gtree.h
+gtypes.h
+gunicode.h
+gurifuncs.h
+gutils.h
+gvarianttype.h
+gvariant.h
+gwin32.h
+gprintf.h
+"
+
+HEADERS_GIO="
+gappinfo.h
+gasyncinitable.h
+gasyncresult.h
+gbufferedinputstream.h
+gbufferedoutputstream.h
+gcancellable.h
+gcontenttype.h
+gcharsetconverter.h
+gconverter.h
+gconverterinputstream.h
+gconverteroutputstream.h
+gdatainputstream.h
+gdataoutputstream.h
+gdrive.h
+gemblem.h
+gemblemedicon.h
+gfile.h
+gfileattribute.h
+gfileenumerator.h
+gfileicon.h
+gfileinfo.h
+gfileinputstream.h
+gfilemonitor.h
+gfilenamecompleter.h
+gfileoutputstream.h
+gfileiostream.h
+gfilterinputstream.h
+gfilteroutputstream.h
+gicon.h
+ginetaddress.h
+ginetsocketaddress.h
+ginputstream.h
+ginitable.h
+gio.h
+giotypes.h
+gioenums.h
+gioerror.h
+giomodule.h
+gioscheduler.h
+giostream.h
+gloadableicon.h
+gmount.h
+gmemoryinputstream.h
+gmemoryoutputstream.h
+gmountoperation.h
+gnativevolumemonitor.h
+gnetworkaddress.h
+gnetworkservice.h
+goutputstream.h
+gresolver.h
+gseekable.h
+gsimpleasyncresult.h
+gsocket.h
+gsocketaddress.h
+gsocketaddressenumerator.h
+gsocketclient.h
+gsocketconnectable.h
+gsocketconnection.h
+gsocketcontrolmessage.h
+gsocketlistener.h
+gsocketservice.h
+gsrvtarget.h
+gtcpconnection.h
+gthreadedsocketservice.h
+gthemedicon.h
+gvfs.h
+gvolume.h
+gvolumemonitor.h
+gzlibcompressor.h
+gzlibdecompressor.h
+"
+
+HEADERS_GOBJECT="
+gboxed.h
+gclosure.h
+genums.h
+gobject.h
+gparam.h
+gparamspecs.h
+gsignal.h
+gsourceclosure.h
+gtype.h
+gtypemodule.h
+gtypeplugin.h
+gvalue.h
+gvaluearray.h
+gvaluecollector.h
+gvaluetypes.h
+gobjectnotifyqueue.c
+gmarshal.h
+"
+
+# install subdirectory below $PREFIX/$INC_DIR (if any)
+INC_SUBDIR=glib-2.0
+
+# License file(s) to install
+LICENSE_INSTALL="COPYING"
+
+# pkg-config .pc files to install
+PKG_CONFIG_INSTALL="
+glib-2.0.pc
+gio-2.0.pc
+gobject-2.0.pc
+gmodule-2.0.pc
+gmodule-no-export-2.0.pc
+gthread-2.0.pc"
+
+# Additional DIFF Flags for generating diff file
+DIFF_FLAGS=
+
+# load common functions
+source ../gcc45_common.sh
+
+# Directory the lib is built in (set this *after* loading gcc45_common.sh)
+BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}"
+
+# == override resp. specify build actions ==
+
+conf_pre()
+{
+ # You must manually specify PCRE_LIBS because we do not have
+ # pkg-config built yet!!
+ CONFIGURE_XTRA_ARGS="\
+ --disable-static \
+ --enable-shared \
+ PKG_CONFIG=${TOPDIR}/pkg-config \
+ --disable-gtk-doc \
+ --with-pcre=system \
+ PCRE_LIBS=-lpcre \
+ MSGFMT=${TOPDIR}/gettext/msgfmt"
+}
+
+conf_post()
+{
+ modify_libtool_nolibprefix ${BUILDDIR}/libtool
+}
+
+build_pre()
+{
+ ( cd ${BUILDDIR} && \
+ make glibconfig.h.win32 && \
+ make glibconfig.h && \
+ mv glibconfig.h glibconfig.h.autogened && \
+ cp -vp glibconfig.h.win32 glibconfig.h )
+}
+
+install()
+{
+ install_pre;
+
+ # Install library, import library and static library
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/gio/.libs/gio-2.0-0.dll $PREFIX/$BIN_DIR
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/gio/.libs/libgio-2.0.dll.a $PREFIX/$LIB_DIR
+
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/glib/.libs/glib-2.0-0.dll $PREFIX/$BIN_DIR
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/glib/.libs/libglib-2.0.dll.a $PREFIX/$LIB_DIR
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/glib/.libs/gspawn-win32-helper.exe $PREFIX/$BIN_DIR
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/glib/.libs/gspawn-win32-helper-console.exe $PREFIX/$BIN_DIR
+
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/gmodule/.libs/gmodule-2.0-0.dll $PREFIX/$BIN_DIR
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/gmodule/.libs/libgmodule-2.0.dll.a $PREFIX/$LIB_DIR
+
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/gobject/.libs/gobject-2.0-0.dll $PREFIX/$BIN_DIR
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/gobject/.libs/libgobject-2.0.dll.a $PREFIX/$LIB_DIR
+
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/gthread/.libs/gthread-2.0-0.dll $PREFIX/$BIN_DIR
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/gthread/.libs/libgthread-2.0.dll.a $PREFIX/$LIB_DIR
+
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/gobject/glib-mkenums $PREFIX/$BIN_DIR
+
+ mkdir -vp $PREFIX/$INC_DIR/$INC_SUBDIR/glib
+ mkdir -vp $PREFIX/$INC_DIR/$INC_SUBDIR/gio
+ mkdir -vp $PREFIX/$INC_DIR/$INC_SUBDIR/gobject
+
+ # Install headers
+ for a in $HEADERS_GLIB; do
+ ${CP} ${CP_FLAGS} ${SRCDIR}/glib/$a $PREFIX/$INC_DIR/$INC_SUBDIR/glib/`basename $a`
+ done
+
+ for a in $HEADERS_GIO; do
+ ${CP} ${CP_FLAGS} ${SRCDIR}/gio/$a $PREFIX/$INC_DIR/$INC_SUBDIR/gio/`basename $a`
+ done
+
+ for a in $HEADERS_GOBJECT; do
+ ${CP} ${CP_FLAGS} ${SRCDIR}/gobject/$a $PREFIX/$INC_DIR/$INC_SUBDIR/gobject/`basename $a`
+ done
+
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/glibconfig.h $PREFIX/$INC_DIR/$INC_SUBDIR
+
+ # Install license file
+ ${CP} ${CP_FLAGS} ${SRCDIR}/gmodule/COPYING $PREFIX/$LIC_DIR/${PKG}/COPYING.gmodule
+
+ install_common;
+ install_post;
+}
+
+install_strip()
+{
+ install;
+ for a in gio-2.0-0.dll glib-2.0-0.dll gmodule-2.0-0.dll gobject-2.0-0.dll gthread-2.0-0.dll; do
+ $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/$a
+ done
+
+ for a in gspawn-win32-helper.exe gspawn-win32-helper-console.exe; do
+ $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/$a
+ done
+}
+
+uninstall()
+{
+ uninstall_pre;
+
+ # Install library, import library and static library
+ ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gio-2.0-0.dll
+ ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/glib-2.0-0.dll
+ ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gmodule-2.0-0.dll
+ ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gobject-2.0-0.dll
+ ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gthread-2.0-0.dll
+
+ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libgio-2.0.dll.a
+ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libglib-2.0.dll.a
+ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libgmodule-2.0.dll.a
+ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libgobject-2.0.dll.a
+ ${RM} ${RM_FLAGS} $PREFIX/$LIB_DIR/libgthread-2.0.dll.a
+
+ ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gspawn-win32-helper.exe
+ ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/gspawn-win32-helper-console.exe
+
+ ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/glib-mkenums
+
+ uninstall_common;
+
+ # Uninstall headers
+ for a in glibconfig.h; do
+ ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$INC_SUBDIR/`basename $a`
+ done
+
+ for a in $HEADERS_GLIB; do
+ ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$INC_SUBDIR/glib/`basename $a`
+ done
+
+ for a in $HEADERS_GIO; do
+ ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$INC_SUBDIR/gio/`basename $a`
+ done
+
+ for a in $HEADERS_GOBJECT; do
+ ${RM} ${RM_FLAGS} $PREFIX/$INC_DIR/$INC_SUBDIR/gobject/`basename $a`
+ done
+
+ rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/$INC_SUBDIR/glib
+ rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/$INC_SUBDIR/gio
+ rmdir --ignore-fail-on-non-empty $PREFIX/$INC_DIR/$INC_SUBDIR/gobject
+
+ # Uninstall license file
+ ${RM} ${RM_FLAGS} $PREFIX/$LIC_DIR/${PKG}/COPYING.gmodule
+
+ uninstall_post;
+}
+
+all() {
+ download
+ unpack
+ applypatch
+ mkdirs
+ conf
+ build
+ install
+}
+
+main $*
Property changes on: trunk/octave-forge/admin/Windows/mingw32/glib/build-2.24.0-5.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Rev Date URL
Added: svn:eol-style
+ LF
Added: trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh
===================================================================
--- trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh (rev 0)
+++ trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh 2010-06-21 13:07:08 UTC (rev 7450)
@@ -0,0 +1,97 @@
+#! /usr/bin/sh
+
+# Name of package
+PKG=pkg-config
+# Version of Package
+VER=0.23
+# Release of (this patched) package
+REL=5
+# Name&Version of Package
+PKGVER=${PKG}-${VER}
+# Full name of this patched Package
+FULLPKG=${PKGVER}-${REL}
+
+# Name of source file(s)
+SRCFILE=${PKGVER}.tar.gz
+# Name of Patch file
+PATCHFILE=${FULLPKG}.patch
+
+# URL(s) of source code file(s)
+URL="http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config-0.23.tar.gz"
+
+# Top dir of this building process (i.e. where the patch file and source file(s) reside)
+TOPDIR=`pwd`
+# Directory source code is extraced to (relative to TOPDIR)
+SRCDIR=${PKGVER}
+# Directory original source code is extracted to (for generating diffs) (relative to TOPDIR)
+SRCDIR_ORIG=${SRCDIR}-orig
+
+# Make file to use (optional)
+MAKEFILE=
+# Any extra flags to pass make to
+MAKE_XTRA=
+
+# Header files to install
+HEADERS_INSTALL=
+HEADERS_BUILD_INSTALL=
+
+# install subdirectory below $PREFIX/$INC_DIR (if any)
+INC_SUBDIR=
+
+# License file(s) to install
+LICENSE_INSTALL="COPYING"
+
+# pkg-config .pc files to install
+PKG_CONFIG_INSTALL=""
+
+# Additional DIFF Flags for generating diff file
+DIFF_FLAGS=
+
+# load common functions
+source ../gcc45_common.sh
+
+# Directory the lib is built in (set this *after* loading gcc45_common.sh)
+BUILDDIR=".build_${BUILD_TARGET}_${FULLPKG}_gcc${GCC_VERSION}${GCC_SYSTEM}"
+
+# == override resp. specify build actions ==
+
+
+install()
+{
+ install_pre;
+
+ # Install library, import library and static library
+ ${CP} ${CP_FLAGS} ${BUILDDIR}/pkg-config.exe $PREFIX/$BIN_DIR
+
+ install_common;
+ install_post;
+}
+
+install_strip()
+{
+ install;
+ $STRIP $STRIP_FLAGS $PREFIX/$BIN_DIR/pkg-config.exe
+}
+
+uninstall()
+{
+ uninstall_pre;
+
+ # Install library, import library and static library
+ ${RM} ${RM_FLAGS} $PREFIX/$BIN_DIR/pkg-config.exe
+
+ uninstall_common;
+ uninstall_post;
+}
+
+all() {
+ download
+ unpack
+ applypatch
+ mkdirs
+ conf
+ build
+ install
+}
+
+main $*
Property changes on: trunk/octave-forge/admin/Windows/mingw32/pkg-config/build-0.23-5.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Rev Date URL
Added: svn:eol-style
+ LF
Added: trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch
===================================================================
--- trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch (rev 0)
+++ trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch 2010-06-21 13:07:08 UTC (rev 7450)
@@ -0,0 +1,167 @@
+diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg pkg-config-0.23-orig/ChangeLog pkg-config-0.23/ChangeLog
+--- pkg-config-0.23-orig/ChangeLog 2009-09-14 21:00:28 +0200
++++ pkg-config-0.23/ChangeLog 2009-09-14 21:00:59 +0200
+@@ -1,3 +1,23 @@
++2008-02-19 Tor Lillqvist <tm...@no...>
++
++ * main.c: Remove the possibility to have a default PKG_CONFIG_PATH
++ in the Registry. It is much more flexible to just use environment
++ variables. In general the Registry is not used in the ports of
++ GTK+ or GNOME libraries and software to Windows.
++
++ * parse.c (parse_line): On Windows, handle also .pc files found in
++ a share/pkgconfig folder when automatically redefining a prefix
++ variable for the package.
++
++ * pkg-config.1: Corresponding changes.
++
++2008-02-18 Tor Lillqvist <tm...@no...>
++
++ * main.c: Fix some bitrot: On Windows, don't use the compile-time
++ PKG_CONFIG_PC_PATH, but deduce a default one at run-time based on
++ the location of the executable. This was originally what
++ pkg-config did on Windows, but it had bit-rotted.
++
+ 2008-01-16 Tollef Fog Heen <tf...@er...>
+
+ * NEWS, configure.in: Release 0.23
+diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg pkg-config-0.23-orig/main.c pkg-config-0.23/main.c
+--- pkg-config-0.23-orig/main.c 2009-09-14 21:00:28 +0200
++++ pkg-config-0.23/main.c 2009-09-14 21:00:59 +0200
+@@ -38,9 +38,13 @@
+
+ #ifdef G_OS_WIN32
+ /* No hardcoded paths in the binary, thanks */
+-#undef PKGLIBDIR
+-/* It's OK to leak this, as PKGLIBDIR is invoked only once */
+-#define PKG_CONFIG_PATH g_strconcat (g_win32_get_package_installation_directory (PACKAGE, NULL), "\\lib\\pkgconfig", NULL)
++/* It's OK to leak this */
++#undef PKG_CONFIG_PC_PATH
++#define PKG_CONFIG_PC_PATH \
++ g_strconcat (g_win32_get_package_installation_subdirectory (NULL, NULL, "lib/pkgconfig"), \
++ ";", \
++ g_win32_get_package_installation_subdirectory (NULL, NULL, "share/pkgconfig"), \
++ NULL)
+ #endif
+
+ static int want_debug_spew = 0;
+@@ -296,57 +300,6 @@
+ add_search_dirs(PKG_CONFIG_PC_PATH, G_SEARCHPATH_SEPARATOR_S);
+ }
+
+-#ifdef G_OS_WIN32
+- {
+- /* Add search directories from the Registry */
+-
+- HKEY roots[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
+- gchar *root_names[] = { "HKEY_CURRENT_USER", "HKEY_LOCAL_MACHINE" };
+- HKEY key;
+- int i;
+- gulong max_value_name_len, max_value_len;
+-
+- for (i = 0; i < G_N_ELEMENTS (roots); i++)
+- {
+- key = NULL;
+- if (RegOpenKeyEx (roots[i], "Software\\" PACKAGE "\\PKG_CONFIG_PATH", 0,
+- KEY_QUERY_VALUE, &key) == ERROR_SUCCESS &&
+- RegQueryInfoKey (key, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+- &max_value_name_len, &max_value_len,
+- NULL, NULL) == ERROR_SUCCESS)
+- {
+- int index = 0;
+- gchar *value_name = g_malloc (max_value_name_len + 1);
+- gchar *value = g_malloc (max_value_len + 1);
+-
+- while (TRUE)
+- {
+- gulong type;
+- gulong value_name_len = max_value_name_len + 1;
+- gulong value_len = max_value_len + 1;
+-
+- if (RegEnumValue (key, index++, value_name, &value_name_len,
+- NULL, &type,
+- value, &value_len) != ERROR_SUCCESS)
+- break;
+-
+- if (type != REG_SZ)
+- continue;
+-
+- value_name[value_name_len] = '\0';
+- value[value_len] = '\0';
+- debug_spew ("Adding directory '%s' from %s\\Software\\"
+- PACKAGE "\\PKG_CONFIG_PATH\\%s\n",
+- value, root_names[i], value_name);
+- add_search_dir (value);
+- }
+- }
+- if (key != NULL)
+- RegCloseKey (key);
+- }
+- }
+-#endif
+-
+ pcsysrootdir = getenv ("PKG_CONFIG_SYSROOT_DIR");
+ if (pcsysrootdir)
+ {
+diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg pkg-config-0.23-orig/parse.c pkg-config-0.23/parse.c
+--- pkg-config-0.23-orig/parse.c 2009-09-14 21:00:28 +0200
++++ pkg-config-0.23/parse.c 2009-09-14 21:00:59 +0200
+@@ -1011,18 +1011,25 @@
+ gchar *prefix = pkg->pcfiledir;
+ const int prefix_len = strlen (prefix);
+ const char *const lib_pkgconfig = "\\lib\\pkgconfig";
++ const char *const share_pkgconfig = "\\share\\pkgconfig";
+ const int lib_pkgconfig_len = strlen (lib_pkgconfig);
++ const int share_pkgconfig_len = strlen (share_pkgconfig);
+
+- if (strlen (prefix) > lib_pkgconfig_len &&
+- pathnamecmp (prefix + prefix_len - lib_pkgconfig_len,
+- lib_pkgconfig) == 0)
++ if ((strlen (prefix) > lib_pkgconfig_len &&
++ pathnamecmp (prefix + prefix_len - lib_pkgconfig_len, lib_pkgconfig) == 0) ||
++ (strlen (prefix) > share_pkgconfig_len &&
++ pathnamecmp (prefix + prefix_len - share_pkgconfig_len, share_pkgconfig) == 0))
+ {
+- /* It ends in lib\pkgconfig. Good. */
++ /* It ends in lib\pkgconfig or share\pkgconfig. Good. */
+
+ gchar *p;
+
+ prefix = g_strdup (prefix);
+- prefix[prefix_len - lib_pkgconfig_len] = '\0';
++ if (strlen (prefix) > lib_pkgconfig_len &&
++ pathnamecmp (prefix + prefix_len - lib_pkgconfig_len, lib_pkgconfig) == 0)
++ prefix[prefix_len - lib_pkgconfig_len] = '\0';
++ else
++ prefix[prefix_len - share_pkgconfig_len] = '\0';
+
+ /* Turn backslashes into slashes or
+ * poptParseArgvString() will eat them when ${prefix}
+diff -urN -x '*.exe' -x '*.dll' -x '*.o' -x '*.a' -x '*.bak' -x '~' -x .hg pkg-config-0.23-orig/pkg-config.1 pkg-config-0.23/pkg-config.1
+--- pkg-config-0.23-orig/pkg-config.1 2009-09-14 21:00:28 +0200
++++ pkg-config-0.23/pkg-config.1 2009-09-14 21:00:59 +0200
+@@ -274,20 +274,10 @@
+
+ .SH WINDOWS SPECIALITIES
+ If a .pc file is found in a directory that matches the usual
+-conventions (i.e., ends with \\lib\\pkgconfig), the prefix for that
+-package is assumed to be the grandparent of the directory where the
+-file was found, and the \fIprefix\fP variable is overridden for that
+-file accordingly.
+-
+-In addition to the \fIPKG_CONFIG_PATH\fP environment variable, the
+-Registry keys
+-.DW
+-\fIHKEY_CURRENT_USER\\Software\\pkgconfig\\PKG_CONFIG_PATH\fP and
+-.EW
+-\fIHKEY_LOCAL_MACHINE\\Software\\pkgconfig\\PKG_CONFIG_PATH\fP can be
+-used to specify directories to search for .pc files. Each (string)
+-value in these keys is treated as a directory where to look for .pc
+-files.
++conventions (i.e., ends with \\lib\\pkgconfig or \\share\\pkgconfig),
++the prefix for that package is assumed to be the grandparent of the
++directory where the file was found, and the \fIprefix\fP variable is
++overridden for that file accordingly.
+
+ .SH AUTOCONF MACROS
+
Property changes on: trunk/octave-forge/admin/Windows/mingw32/pkg-config/pkg-config-0.23-5.patch
___________________________________________________________________
Added: svn:eol-style
+ LF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|