tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Please import some patches for breakage in 2019Q4 (or verify it's gone in 2020Q1)
Hi folks,
I'm knee-deep in building software with pkgsrc at the foundations. Just
right now I realized I lost a good deal of my time due to a pkgsrc
patch breaking Python Fortran extensions using shared libs. Literally,
I lost … heck … well, let's say … hours.
I try to be civil in my current mood. So I better keep it short. I'm
trying. Please consider importing some patches into the upcoming
2020Q1. My patches are available on
http://src.rrz.uni-hamburg.de/extra/pkgsrc-patches/patches/
but I'll try to attach the most important ones here. Several of the
above patches deal with integrating the modern BLAS support or with me
trying to get things to build with gcc -flto, the latter project getting
dropped due to too much fallout in the end.
So, the easy fixes:
1. math-py-numpy-nastypatch.patch
This prevents distutils constructing linker command lines with `gfortran
-Wall -shared $empty_frikkin_string …`, causing instant breakage with
gfortran complaining that the file $empty_frikkin_string does not
exist. There don't seem to be a whole lot of Fortran-based Python
extensions in pkgsrc. I encountered this while building pyBDSF for our
astrophysicists. Please note that the distinfo hook will fail when my
BLAS patch is not applied beforehand.
2. devel-subversion-plaintext.patch
Since pkgsrc is not afraid to patch things and diverting from upstream
defaults, I ask to re-enable the option to store plaintext passwords as
it was with earlier releases of subversion. There are not that many
use-cases left for subversion (pkgsrc will migrate from CVS to git at
some point … or is there a soft spot for fossil? mercurial? darcs?),
one of them is automated checkouts/commits combined with hierarchical
repository permissions. This is needlessly destroyed by current
upstream default. Note that subversion still kicks and screams at you
for using that option at runtime, so security consciousness is assured.
3. geography-libgeotiff-buildlinks.patch
Just a buildlink file to ease future packages depending on this. I am
working on wip/pdal that depends on libgeotiff. That is, I was working
on that before I got stuck on things like broken Python Fortran
extensions …
4. devel-netcdf-fortran-lowercasemod.patch
Oh, interesting … forgot about that one, but that means it still
applies and fixes breakage. Those F90 module file names are lowercase.
5. graphics-gnuplot-readline.patch
Another long-lived patch that didn't make it yet. Gnuplot wants to know
if it uses GNU or BSD readline. Easy enough, I hope.
6. devel-gdb-gcore-manpage.patch
There's a manpage for gdb missing. Since I only test on Linux, I added
it to PLIST.Linux, but it probably should be in PLIST.common .
Perhaps less easy, but at least worth discussing how to do properly.
7. devel-boost-libs-libbacktrace.patch
Don't look for Debian and run. Do a proper test if there is a
libbacktrace present. Thank you.
8. devel-boost-libs-mpi-option.patch and
devel-boost-libs-mpi-option-PLIST.patch
Add option for parallel portions of Boost to be built.
9. math-R-gstat-no-blas-needed.patch
Doesn't need BLAS. So don't depend on it.
Perhaps debatable, or at least needing a bit more thought/care:
10. www-curl-sslcertbundle.patch and
security-openssl-centos7-sslcertbundle.patch
I need this on systems that use a certificate bundle instead of
individual certificate files, namely CentOS 7. Otherwise curl is
broken. Discuss?
11. devel-boost-jam-fix-rpath.patch
I use RPATH in my pkgsrc builds. This fixes that use case for
boost-jam. Not sure what smartness to add in case we do _not_ want
RPATH/RUNPATH in pkgsrc binaries.
Oh, and then there's x11 stuff … nearly forgot:
12. x11-fltk13-deps.patch
Missing dependencies.
13. x11-qt5-qtbase-extradeps.patch
Still that issue that libdrm may be silently picked up in system. So
better make the dependency explicit.
14. x11-qt5-qtbase-unbreakmarchnative.patch
See QTBUG-71564 as indicated in the patch. CXXFLAGS with -march=native
may be broken without the patch.
15. x11-tk-xscreensaverdep.patch
Make (non-)dependency of Tk to libXScrnSaver explicit.
Well … that's enough for a start, isn't it? ;-)
Alrighty then,
Thomas
PS: Do we have the new BLAS system in 2020Q1 now? Jason wanted to merge
things …
--
Dr. Thomas Orgis
HPC @ Universität Hamburg
diff -ruN -x CVS pkgsrc-2019Q4/math/py-numpy/distinfo pkgsrc/math/py-numpy/distinfo
--- pkgsrc-2019Q4/math/py-numpy/distinfo 2019-06-14 16:33:07.000000000 +0200
+++ pkgsrc/math/py-numpy/distinfo 2020-03-25 23:41:42.515080252 +0100
@@ -6,6 +6,6 @@
Size (numpy-1.16.4.zip) = 5122740 bytes
SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53
SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
-SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = db8d3238c618ecd5900650a2150efb9459e94e96
-SHA1 (patch-numpy_distutils_system__info.py) = 1de2d45661a6eade2412e3af7b8574748db43ef0
+SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 893b0556f869543074cb74d5d4385d2f155004ec
+SHA1 (patch-numpy_distutils_system__info.py) = 1de2d45661a6eade2412e3af7b8574748db43ef0
SHA1 (patch-numpy_linalg_lapack__litemodule.c) = b421455fdbb666c8075d8bffbeb59533434d23e6
diff -ruN -x CVS pkgsrc-2019Q4/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py
--- pkgsrc-2019Q4/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py 2018-05-14 08:36:17.000000000 +0200
+++ pkgsrc/math/py-numpy/patches/patch-numpy_distutils_fcompiler_gnu.py 2020-03-25 23:41:34.623303865 +0100
@@ -30,7 +30,7 @@
'compiler_f90' : None, # Use --fcompiler=gnu95 for f90 codes
'compiler_fix' : None,
- 'linker_so' : [None, "-g", "-Wall"],
-+ 'linker_so' : [None, "-Wall", "-shared", ""],
++ 'linker_so' : [None, "-Wall", "-shared"],
'archiver' : ["ar", "-cr"],
'ranlib' : ["ranlib"],
- 'linker_exe' : [None, "-g", "-Wall"]
@@ -69,7 +69,7 @@
+ 'compiler_fix' : [None, "-Wall", "-ffixed-form",
"-fno-second-underscore"] + _EXTRAFLAGS,
- 'linker_so' : ["<F90>", "-Wall", "-g"],
-+ 'linker_so' : ["<F90>", "-Wall", "-shared", ""],
++ 'linker_so' : ["<F90>", "-Wall", "-shared"],
'archiver' : ["ar", "-cr"],
'ranlib' : ["ranlib"],
'linker_exe' : [None, "-Wall"]
diff -x CVS -ruN pkgsrc-2019Q4/devel/subversion-base/Makefile pkgsrc/devel/subversion-base/Makefile
--- pkgsrc-2019Q4/devel/subversion-base/Makefile 2019-05-27 18:10:08.000000000 +0200
+++ pkgsrc/devel/subversion-base/Makefile 2020-03-23 23:46:26.282188597 +0100
@@ -2,6 +2,7 @@
PKGNAME= subversion-base-${SVNVER}
COMMENT= Version control system, base programs and libraries
+PKGREVISION= 1
# on at least solaris, configure fails to figure out
# that you need -lintl
@@ -12,6 +13,8 @@
USE_TOOLS+= msgfmt pkg-config
CONFIGURE_ARGS+= --without-apxs
+# Used to be a standard feature and some people depend on it!
+CONFIGURE_ARGS+= --enable-plaintext-password-storage
APU_OPTIONS= PKG_BUILD_OPTIONS.apr-util
BUILD_DEFS+= ${APU_OPTIONS}
diff -ruN pkgsrc.2014Q3/geography/libgeotiff/buildlink3.mk pkgsrc/geography/libgeotiff/buildlink3.mk
--- pkgsrc.2014Q3/geography/libgeotiff/buildlink3.mk 1970-01-01 01:00:00.000000000 +0100
+++ pkgsrc/geography/libgeotiff/buildlink3.mk 2014-09-24 15:41:22.130748006 +0200
@@ -0,0 +1,14 @@
+# $NetBSD$
+BUILDLINK_TREE+= libgeotiff
+
+.if !defined(LIBGEOTIFF_BUILDLINK3_MK)
+LIBGEOTIFF_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libgeotiff+= libgeotiff>=1.4.0nb1
+BUILDLINK_PKGSRCDIR.libgeotiff?= ../../geography/libgeotiff
+
+#.include "../../geography/proj/buildlink3.mk"
+#.include "../../graphics/tiff/buildlink3.mk"
+.endif # LIBGEOTIFF_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -libgeotiff
diff -ruN pkgsrc-2014Q2/devel/netcdf-fortran/PLIST pkgsrc/devel/netcdf-fortran/PLIST
--- pkgsrc-2014Q2/devel/netcdf-fortran/PLIST 2013-04-29 09:43:32.000000000 +0200
+++ pkgsrc/devel/netcdf-fortran/PLIST 2014-09-30 17:41:22.843177740 +0200
@@ -1,7 +1,7 @@
@comment $NetBSD: PLIST,v 1.1 2013/04/29 07:43:32 adam Exp $
bin/nf-config
-${PLIST.f90}include/NETCDF.mod
-${PLIST.f90}include/TYPESIZES.mod
+${PLIST.f90}include/netcdf.mod
+${PLIST.f90}include/typesizes.mod
include/netcdf.inc
info/netcdf-f77.info
info/netcdf-f77.info-1
diff -ruN -x CVS pkgsrc-cvs/./graphics/gnuplot/Makefile pkgsrc/./graphics/gnuplot/Makefile
--- pkgsrc-cvs/./graphics/gnuplot/Makefile 2019-03-23 11:44:19.601214291 +0100
+++ pkgsrc/./graphics/gnuplot/Makefile 2019-03-25 14:42:28.246247928 +0100
@@ -16,7 +16,6 @@
USE_LANGUAGES= c
USE_TOOLS+= makeinfo pkg-config gmake
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-readline=bsd
CONFIGURE_ARGS+= --without-latex
CONFIGURE_ARGS+= --without-tutorial
CONFIGURE_ARGS+= ac_cv_prog_EMACS=
@@ -38,4 +37,9 @@
.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"
+.if $(READLINE_TYPE) == "readline"
+CONFIGURE_ARGS+= --with-readline=gnu
+.else
+CONFIGURE_ARGS+= --with-readline=bsd
+.endif
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/devel/gdb/PLIST.Linux.orig 2019-04-11 16:25:55.371756495 +0200
+++ pkgsrc/devel/gdb/PLIST.Linux 2019-04-11 16:26:28.311772653 +0200
@@ -1,3 +1,4 @@
@comment $NetBSD: PLIST.Linux,v 1.5 2018/01/31 20:33:11 maya Exp $
bin/gdbserver
lib/libinproctrace.so
+${PLIST.gcore}man/man1/gcore.1
--- pkgsrc/devel/boost-libs/Makefile.orig2 2020-02-12 08:17:22.625611042 +0100
+++ pkgsrc/devel/boost-libs/Makefile 2020-02-12 19:01:47.592665836 +0100
@@ -44,9 +44,10 @@
.endif
# libboost_stacktrace_backtrace requires libbacktrace.
-# FIXME: The condition needs to be refined for non-Debian/Ubuntu
-# platforms shipped with libbacktrace.
-.if ${OPSYS} == "Linux" && exists(/etc/debian_version)
+# When someone tests this on non-Linux, the OPSYS check may be
+# removed.
+TEST_BACKTRACE_CMD= sh ${FILESDIR}/test-backtrace.sh '${CXX} ${CXXFLAGS} ${CPPFLAGS}'
+.if ${OPSYS} == "Linux" && ${TEST_BACKTRACE_CMD:sh} == "yes"
PLIST.backtrace= yes
.endif
diff -ruN pkgsrc-2019Q4/devel/boost-libs/files/test-backtrace.sh pkgsrc/devel/boost-libs/files/test-backtrace.sh
--- pkgsrc-2019Q4/devel/boost-libs/files/test-backtrace.sh 1970-01-01 01:00:00.000000000 +0100
+++ pkgsrc/devel/boost-libs/files/test-backtrace.sh 2020-02-12 19:03:05.962260351 +0100
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Given a compiler command, test if libbacktrace is available.
+# It is shipped with GCC, sometimes, and not in the official
+# places.
+
+set -e
+
+cc=$1; shift
+dir=$(mktemp -d "${TMPDIR:-/tmp}/conftest.XXXXXX")
+cd "$dir"
+cat > test.c <<EOT
+#include <backtrace.h>
+int main()
+{
+ return 0;
+}
+EOT
+$cc -o test test.c -lbacktrace 2>/dev/null &&
+echo yes ||
+echo no
+cd
+rm -rf "$dir"
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/boost-libs/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- devel/boost-libs/Makefile 29 May 2017 14:39:28 -0000 1.56
+++ devel/boost-libs/Makefile 14 Jul 2017 15:35:06 -0000
@@ -13,6 +13,8 @@
BJAM_ARGS+= --without-python
PLIST_VARS+= context fiber log
+.include "options.mk"
+
.if ${OPSYS} == "NetBSD" && ((${MACHINE_ARCH} == "i386") || (!empty(MACHINE_ARCH:Mearm*) && !empty(PKGSRC_COMPILER:Mgcc)))
BJAM_ARGS+= pch=off
.endif
Index: options.mk
===================================================================
RCS file: options.mk
diff -N options.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/boost-libs/options.mk 14 Jul 2017 15:35:06 -0000
@@ -0,0 +1,21 @@
+PKG_OPTIONS_VAR= PKG_OPTIONS.boost
+PKG_SUPPORTED_OPTIONS= mpi
+PKG_SUGGESTED_OPTIONS=
+
+PLIST_VARS+= mpi
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mmpi)
+
+# Need to enable MPI behind the scenes.
+mpihackery:
+ echo "using mpi ;" >> ${WRKSRC}/project-config.jam
+
+pre-configure: mpihackery
+
+.include "../../mk/mpi.buildlink3.mk"
+
+PLIST.mpi= yes
+
+.endif
--- pkgsrc/devel/boost-libs/PLIST.orig 2020-02-07 22:09:53.703687574 +0100
+++ pkgsrc/devel/boost-libs/PLIST 2020-02-09 14:09:32.612045412 +0100
@@ -181,3 +181,13 @@
lib/libboost_wserialization.so.1
lib/libboost_wserialization.so.1.71
lib/libboost_wserialization.so.${PKGVERSION}
+${PLIST.mpi}lib/libboost_graph_parallel.a
+${PLIST.mpi}lib/libboost_graph_parallel.so
+${PLIST.mpi}lib/libboost_graph_parallel.so.1
+${PLIST.mpi}lib/libboost_graph_parallel.so.1.71
+${PLIST.mpi}lib/libboost_graph_parallel.so.${PKGVERSION}
+${PLIST.mpi}lib/libboost_mpi.a
+${PLIST.mpi}lib/libboost_mpi.so
+${PLIST.mpi}lib/libboost_mpi.so.1
+${PLIST.mpi}lib/libboost_mpi.so.1.71
+${PLIST.mpi}lib/libboost_mpi.so.${PKGVERSION}
diff -x CVS -ruN pkgsrc-2019Q1/math/R-gstat/Makefile pkgsrc/math/R-gstat/Makefile
--- pkgsrc-2019Q1/math/R-gstat/Makefile 2018-07-28 16:40:48.000000000 +0200
+++ pkgsrc/math/R-gstat/Makefile 2019-04-13 00:15:30.186727814 +0200
@@ -15,5 +15,4 @@
DEPENDS+= R-FNN>=0:../../math/R-FNN
.include "../../math/R/Makefile.extension"
-.include "../../math/blas/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
--- pkgsrc-2015Q4/www/curl/Makefile 2015-12-06 12:31:13.000000000 +0100
+++ pkgsrc/www/curl/Makefile 2016-01-26 15:53:36.714455973 +0100
@@ -21,7 +21,6 @@
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
-CONFIGURE_ARGS+= --with-ca-path=${SSLCERTS}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
PKGCONFIG_OVERRIDE= libcurl.pc.in
@@ -48,3 +47,11 @@
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
+
+# Openssl builtin detection sets SSLCERTBUNDLE if a bundle is found
+# in /etc/. This is essential to have working curl!
+.if !empty(SSLCERTBUNDLE)
+CONFIGURE_ARGS+= --with-ca-bundle=${SSLCERTBUNDLE}
+.else
+CONFIGURE_ARGS+= --with-ca-path=${SSLCERTS}
+.endif
--- pkgsrc-2015Q4/security/openssl/builtin.mk 2015-03-26 09:05:02.000000000 +0100
+++ pkgsrc/security/openssl/builtin.mk 2016-01-26 15:31:04.972886777 +0100
@@ -214,6 +214,9 @@
. else
SSLDIR= /boot/common/data/ssl
. endif
+# The fresh thing on CentOS 7.
+. elif exists(/etc/pki/tls)
+SSLDIR=/etc/pki/tls
. else
SSLDIR= /etc/ssl # most likely place
. endif
@@ -221,10 +224,14 @@
SSLDIR= ${PKG_SYSCONFBASEDIR}/openssl
. endif
+# Again, CentOS 7. Maybe should be set by user in mk.conf?
+. if exists(${SSLDIR}/certs/ca-bundle.crt)
+SSLCERTBUNDLE= ${SSLDIR}/certs/ca-bundle.crt
+. endif
SSLCERTS= ${SSLDIR}/certs
SSLKEYS= ${SSLDIR}/private
-BUILD_DEFS+= SSLDIR SSLCERTS SSLKEYS
+BUILD_DEFS+= SSLDIR SSLCERTBUNDLE SSLCERTS SSLKEYS
# create pc files for builtin version; other versions assumed to contain them
# If we are using the builtin version, check whether it has a *.pc
diff -ruN -x CVS pkgsrc-2016Q4/devel/boost-jam/bjam.mk pkgsrc/devel/boost-jam/bjam.mk
--- pkgsrc-2016Q4/devel/boost-jam/bjam.mk 2016-02-29 00:54:11.000000000 +0100
+++ pkgsrc/devel/boost-jam/bjam.mk 2017-03-16 15:32:24.260884756 +0100
@@ -43,6 +43,10 @@
BJAM_BUILD+= threading=multi
BJAM_BUILD+= link=shared,static
+# Support RPATH in generated libs for paths mentioned in LDFLAGS.
+BJAM_ARGS+= hardcode-dll-paths=true
+BJAM_ARGS+= ${BUILDLINK_PASSTHRU_RPATHDIRS:@p@dll-path=${p}@}
+
BJAM_CMD= ${SETENV} ${MAKE_ENV} ${BJAM} ${BJAM_ARGS}
UNLIMIT_RESOURCES+= datasize
--- pkgsrc/x11/fltk13/Makefile.orig 2020-02-07 22:09:53.967679231 +0100
+++ pkgsrc/x11/fltk13/Makefile 2020-02-09 14:47:17.280857253 +0100
@@ -66,6 +66,8 @@
. include "../../x11/libXext/buildlink3.mk"
. include "../../x11/libXft/buildlink3.mk"
. include "../../x11/libXinerama/buildlink3.mk"
+. include "../../x11/libxcb/buildlink3.mk"
+. include "../../x11/libXcursor/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXt?= build
. include "../../x11/libXt/buildlink3.mk"
.endif
--- pkgsrc/x11/qt5-qtbase/Makefile.orig 2020-02-07 22:09:53.979678851 +0100
+++ pkgsrc/x11/qt5-qtbase/Makefile 2020-02-09 14:34:25.969104194 +0100
@@ -103,6 +103,10 @@
LDFLAGS+= -lresolv
. endif
.elif ${OPSYS} == "Linux"
+# Explicitly enable kms to avoid breakage later on PLIST
+# checking when system libdrm is picked up anyway.
+CONFIGURE_ARGS+= -kms
+.include "../../x11/libdrm/buildlink3.mk"
LDFLAGS+= -ldl
.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
. if exists(/usr/lib/libexecinfo.so)
diff -ruN -x CVS pkgsrc-2019Q1/x11/qt5-qtbase//distinfo pkgsrc/x11/qt5-qtbase//distinfo
--- pkgsrc-2019Q1/x11/qt5-qtbase//distinfo 2019-03-26 12:14:16.000000000 +0100
+++ pkgsrc/x11/qt5-qtbase//distinfo 2019-06-13 15:44:12.207300723 +0200
@@ -5,6 +5,7 @@
SHA512 (qtbase-everywhere-src-5.12.2.tar.xz) = 6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613
Size (qtbase-everywhere-src-5.12.2.tar.xz) = 48364464 bytes
SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
+SHA1 (patch-mkspecs_common_gcc-base.conf) = 8ad8d51a8a4bc7211d6dfe241ae2b4df030319c7
SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515
SHA1 (patch-qmake_Makefile.unix) = ec1af3d76dc5bd0b7b1d375ceeebbd016b6f555f
diff -ruN -x CVS pkgsrc-2019Q1/x11/qt5-qtbase//patches/patch-mkspecs_common_gcc-base.conf pkgsrc/x11/qt5-qtbase//patches/patch-mkspecs_common_gcc-base.conf
--- pkgsrc-2019Q1/x11/qt5-qtbase//patches/patch-mkspecs_common_gcc-base.conf 1970-01-01 01:00:00.000000000 +0100
+++ pkgsrc/x11/qt5-qtbase//patches/patch-mkspecs_common_gcc-base.conf 2019-06-13 15:42:04.683381845 +0200
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- ./mkspecs/common/gcc-base.conf.orig 2019-06-13 13:36:03.554816463 +0000
++++ ./mkspecs/common/gcc-base.conf
+@@ -109,7 +109,8 @@ QMAKE_CFLAGS_MIPS_DSP += -mdsp
+ QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2
+
+ # -march=haswell is supported as of GCC 4.9 and Clang 3.6
+-QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2
++# https://bugreports.qt.io/browse/QTBUG-71564
++QMAKE_CFLAGS_ARCH_HASWELL = -mavx2
+
+ # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code
+ QMAKE_AR_LTCG = gcc-ar cqs
diff -ruN -x CVS pkgsrc-2017Q2/x11/tk/options.mk pkgsrc/x11/tk/options.mk
--- pkgsrc-2017Q2/x11/tk/options.mk 2016-09-03 13:58:02.000000000 +0200
+++ pkgsrc/x11/tk/options.mk 2017-08-07 11:48:32.780105120 +0200
@@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.5 2016/09/03 11:58:02 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.tk
-PKG_SUPPORTED_OPTIONS= threads debug xft2
+PKG_SUPPORTED_OPTIONS= threads debug xft2 xscreensaver
PKG_SUGGESTED_OPTIONS= threads
.include "../../mk/bsd.prefs.mk"
@@ -44,3 +44,11 @@
.else
CONFIGURE_ARGS+= --disable-xft
.endif
+
+.if !empty(PKG_OPTIONS:Mxscreensaver)
+CONFIGURE_ARGS+= --enable-xss
+USE_TOOLS+= pkg-config
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-xss
+.endif
Home |
Main Index |
Thread Index |
Old Index