Mercurial > mxe-octave

changeset 3051:9cb1ce8082a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update qt.mk to install .pc files in native mingw * src/qt.mk QT_BUILD: if native ming, fix .qt files for paths in Lib: -L option and xxx_location options and copy files to HOST_LIBDIR/pkgconfig.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 14 Jun 2013 21:02:02 -0400
parents 5e8414a77b7d
children 0a5631d32cd9
files src/qt.mk
diffstat 1 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt.mk	Fri Jun 14 17:39:00 2013 -0400
+++ b/src/qt.mk	Fri Jun 14 21:02:02 2013 -0400
@@ -117,6 +117,17 @@
 
     $(MAKE) -C '$(1)' -j '$(JOBS)' 
     $(MAKE) -C '$(1)' -j 1 install
+
+    # native build doesnt seem to succeed with installing pkgconfig files to prefix    
+    # in addition, .pc files have the wrong paths, mangled lib names
+    if [ "$(MXE_NATIVE_MINGW_BUILD)" = yes ]; then \
+       find $(1)/lib/pkgconfig/*.pc -exec $(SED) -i \
+         -e 's,\(.*\)_location=.*,\1_location=$(HOST_BINDIR)/\1,g' \
+         -e 's,\(Libs:.* -l\).*[\\/]\([A-Za-z0-9]*\),\1\2,g' \
+         '{}' ';' ; \
+       cp '$(1)/lib/pkgconfig/'*.pc '$(HOST_LIBDIR)/pkgconfig/';  \
+    fi
+
     $(LN_SF) '$(HOST_BINDIR)/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'
     $(LN_SF) '$(HOST_BINDIR)/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)roc'
     $(LN_SF) '$(HOST_BINDIR)/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'