36 lines
2 KiB
Text
36 lines
2 KiB
Text
$NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $
|
|
|
|
--- qmake/generators/unix/unixmake2.cpp.orig 2009-09-29 13:01:33.000000000 +0200
|
|
+++ qmake/generators/unix/unixmake2.cpp
|
|
@@ -232,6 +232,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
|
if(!project->isEmpty("QMAKE_BUNDLE")) {
|
|
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
|
|
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
|
|
+ } else if(project->isActiveConfig("compile_libtool")) {
|
|
+ t << "TARGETD = " << var("TARGET_la") << endl;
|
|
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
|
|
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
|
|
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
|
|
@@ -993,8 +995,12 @@ void UnixMakefileGenerator::init2()
|
|
} else if (project->isActiveConfig("staticlib")) {
|
|
project->values("TARGET").first().prepend("lib");
|
|
project->values("TARGET").first() += ".a";
|
|
- if(project->values("QMAKE_AR_CMD").isEmpty())
|
|
+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
|
|
+ if(project->isActiveConfig("compile_libtool"))
|
|
+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
|
|
+ else
|
|
project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)");
|
|
+ }
|
|
} else {
|
|
project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
|
|
if(project->isActiveConfig("compile_libtool"))
|
|
@@ -1445,7 +1451,7 @@ UnixMakefileGenerator::writePkgConfigFil
|
|
bundle = bundle.left(suffix);
|
|
pkgConfiglibName = "-framework " + bundle + " ";
|
|
} else {
|
|
- pkgConfiglibDir = "-L${libdir}";
|
|
+ pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
|
|
pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
|
|
}
|
|
t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
|