diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-09-22 03:26:12 +0800 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-09-22 03:26:12 +0800 |
| commit | 439a13a8289cc8967684257114055a71fd630b74 (patch) | |
| tree | 71e3d9baecbbb4f13864494dd2219158f0d0a1c7 /converters | |
| parent | 074690fb5eb707e0e177e62306fd1aaa225b5cf5 (diff) | |
| download | freebsd-ports-gnome-439a13a8289cc8967684257114055a71fd630b74.tar.gz freebsd-ports-gnome-439a13a8289cc8967684257114055a71fd630b74.tar.zst freebsd-ports-gnome-439a13a8289cc8967684257114055a71fd630b74.zip | |
converters/wkhtmltopdf: fix build on GCC architectures
USES=compiler:c++11-lang overwrites USE_GCC=8.
The patch adding LDFLAGS for gcc is missing.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/wkhtmltopdf/Makefile | 3 | ||||
| -rw-r--r-- | converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile index 358a2bcec563..0911f1f67a85 100644 --- a/converters/wkhtmltopdf/Makefile +++ b/converters/wkhtmltopdf/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png -USES= compiler:c++11-lang gmake iconv jpeg perl5 pkgconfig ssl xorg +USES= gmake iconv jpeg perl5 pkgconfig ssl xorg USE_GCC= 8 USE_XORG= x11 xext xrender USE_PERL5= build @@ -66,7 +66,6 @@ post-patch: -e 's|/usr/X11R6/lib|${LOCALBASE}/lib|g' \ ${PATCH_WRKSRC}/mkspecs/freebsd-g++/qmake.conf ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \ ${PATCH_WRKSRC}/mkspecs/common/gcc-base.conf ${REINPLACE_CMD} -e "s|gcc|${CC}|g" -e "s|g++|${CXX}|g" \ ${PATCH_WRKSRC}/mkspecs/common/g++-base.conf diff --git a/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf b/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf new file mode 100644 index 000000000000..177e2cdc5335 --- /dev/null +++ b/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf @@ -0,0 +1,11 @@ +--- mkspecs/common/gcc-base.conf.orig 2020-09-02 16:07:46 UTC ++++ mkspecs/common/gcc-base.conf +@@ -53,7 +53,7 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB + QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC + QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden + +-QMAKE_LFLAGS += ++QMAKE_LFLAGS += -Wl,-rpath=%%LOCALBASE%%/lib/gcc8 + QMAKE_LFLAGS_DEBUG += + QMAKE_LFLAGS_APP += + QMAKE_LFLAGS_RELEASE += |