cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix .la files generated by qt5's qmake, there was a missing newline before

Browse Source 
a comment resulting in libtool scripts not being able to parse the line
correctly. Problem reported by Vadim Penzin. Use of 'endl' rather than
'\n' requested by rsadowski.

Bumps to follow for other ports using the qt5 module and including .la files.
This commit is contained in:
sthen 2019-06-24 20:50:41 +00:00
parent 76c9d02574
commit 3da442a955
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x11/qt5/qtbase/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2019/05/20 22:15:29 naddy Exp $
# $OpenBSD: Makefile,v 1.30 2019/06/24 20:50:41 sthen Exp $
DISTNAME = qtbase-opensource-src-${DIST_VERSION}
QT5NAME = Qt5 core
@ -11,18 +11,18 @@ COMMENT-sqlite2 = SQLite 2.x plugin for Qt5
COMMENT-tds = TDS plugin for Qt5
PKGNAME-mysql = qt5-mysql-${VERSION}
PKGNAME-global = qt5-global-${VERSION}
PKGNAME-global = qt5-global-${VERSION}
PKGNAME-psql = qt5-postgresql-${VERSION}
PKGNAME-sqlite2 = qt5-sqlite2-${VERSION}
PKGNAME-tds = qt5-tds-${VERSION}
REVISION-global = 0
REVISION-main = 5
REVISION-mysql = 0
REVISION-psql = 0
REVISION-sqlite2 = 0
REVISION-tds = 0
REVISION-main = 4
PKG_ARCH-global = *
PKG_ARCH-examples = *

7
x11/qt5/qtbase/patches/patch-qmake_generators_unix_unixmake2_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.3 2018/07/05 09:49:13 rsadowski Exp $
$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.4 2019/06/24 20:50:41 sthen Exp $
1. Un-hardcode system paths and compiler flags.
2. Make sure some paths are listed before others, needed to
make sure egcc won't pick up /usr/include before its own
@ -136,13 +136,14 @@ Index: qmake/generators/unix/unixmake2.cpp
} else if (!project->isEmpty("QMAKE_AIX_SHLIB")) {
project->values("TARGET_").append(project->first("QMAKE_PREFIX_STATICLIB") + project->first("TARGET")
+ "." + project->first("QMAKE_EXTENSION_STATICLIB"));
@@ -1465,18 +1498,32 @@ UnixMakefileGenerator::writeLibtoolFile()
@@ -1465,18 +1498,33 @@ UnixMakefileGenerator::writeLibtoolFile()
<< QT_VERSION_STR << ")";
t << "\n";
+ if (!project->isEmpty("QMAKE_OPENBSD_SHLIB"))
+ t << "LIB" << fileVar("QMAKE_ORIG_TARGET") << "_VERSION="
+ << project->first("VER_MAJ") << "." << project->first("VER_MIN");
+ << project->first("VER_MAJ") << "." << project->first("VER_MIN")
+ << endl;
+
t << "# The name that we can dlopen(3).\n"
- << "dlname='" << fileVar(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")