Hi, I am rolling out pkgsrc 2015Q2 together with gcc-5.2.0 on a GNU/Linux system (CentOS 7.1) and I want to drop a note for the little patches I needed so far. I hope we don't need much discussion for the obvious ones and a kind soul with commit access can apply them to pkgsrc. Patch 1: multimedia-libvpx-gcc5.patch Make libvpx work with gcc5, original coming from http://launchpadlibrarian.net/199480430/libvpx_1.3.0-3_1.3.0-3ubuntu1.diff.gz . Patch 2: print-luatex-cppflags-kpathsea.patch There is a fix for finding kpathsea's header strangely put into lib/ instead of include/ (anyone got a frikkin' idea _why_ that header moved there?) in pkgsrc 2015Q2, but it uses CFLAGS. That still failed for me in a line involving g++. Using CPPFLAGS instead does the trick for me. Patch 3: devel-nbpatch-gcc5.patch Very early on it was apparent that nbpatch now needs _GNU_SOURCE to be able to use asprintf(). Patch 4: mk-mpi-buildlink3-do-nothing-for-native.patch This is not a little fixup but a feature patch: Add the option of MPI_TYPE = native to use a system-installed MPI library. This I will exclusively use on our system from now on, since we install several toolchains with MPI included, pkgsrc built on top of that. Those I'm carrying along since 2014Q3 and they still seem to be needed (at least apply and don't cause additional issues): Patch 5: security-mit-kerb5-modern-linux.patch Enable mit-krb5 to find the system-installed version on CentOS 7.1 . Patch 6: devel-netcdf-fortran-lowercasemod.patch At least for me, the installed module file names are lowercase. This fixes PLIST of devel/netcdf-fortran for that fact. Hm, then I got new packages for geography/libLAS and geography/laszip, with the addition of a buildlinks file for libgeotiff. I'm not sure if those are in the shape for general use. They worked for us to install a geography package with a massive dependency list and the users didn't complain. Log file 1: pkgtools-p5-pkgsrc-Dewey-failure-nbcompat.log.bz2 Then, there is an outstanding issue in that I cannot install pkgtools/pkglint due to pkgtools/p5-pkgsrc-Dewey failing to properly use linnbcompat stuff. Build log is attached, lack of strlcpy() and err() being apparent. This is not a dealbreaker for me right now, but some hints are welcome. Alrighty then, Thomas -- Dr. Thomas Orgis Universität Hamburg RRZ / Zentrale Dienste / HPC Schlüterstr. 70 20146 Hamburg Tel.: 040/42838 8826 Fax: 040/428 38 6270
diff -x CVS -ruN /scratch/sw/pkgsrc-2015Q2/multimedia/libvpx/distinfo pkgsrc/multimedia/libvpx/distinfo --- /scratch/sw/pkgsrc-2015Q2/multimedia/libvpx/distinfo 2014-11-14 12:51:01.000000000 +0100 +++ pkgsrc/multimedia/libvpx/distinfo 2015-08-09 11:34:49.500063616 +0200 @@ -13,3 +13,4 @@ SHA1 (patch-test_i420__video__source.h) = e67478f08339c4b7f4cccf96e4798d1972941a7c SHA1 (patch-test_sad__test.cc) = fb39c0ca4ce5f424d878779a2d58ebe77c41e8b3 SHA1 (patch-test_sixtap__predict__test.cc) = d803819f3e5d282c3159e4410e7fbbd68cd403be +SHA1 (patch-gcc5) = 78d5cc37f26e0e71aa5100ba7ff542ca47ba717e diff -x CVS -ruN /scratch/sw/pkgsrc-2015Q2/multimedia/libvpx/patches/patch-gcc5 pkgsrc/multimedia/libvpx/patches/patch-gcc5 --- /scratch/sw/pkgsrc-2015Q2/multimedia/libvpx/patches/patch-gcc5 1970-01-01 01:00:00.000000000 +0100 +++ pkgsrc/multimedia/libvpx/patches/patch-gcc5 2015-08-09 11:34:04.304400972 +0200 @@ -0,0 +1,26 @@ +Index: nestegg/halloc/src/align.h +=================================================================== +--- nestegg/halloc/src/align.h ++++ nestegg/halloc/src/align.h +@@ -30,7 +30,7 @@ union max_align + void (*q)(void); + }; + +-typedef union max_align max_align_t; ++typedef union max_align h_max_align_t; + + #endif + +Index: nestegg/halloc/src/halloc.c +=================================================================== +--- nestegg/halloc/src/halloc.c ++++ nestegg/halloc/src/halloc.c +@@ -30,7 +30,7 @@ typedef struct hblock + #endif + hlist_item_t siblings; /* 2 pointers */ + hlist_head_t children; /* 1 pointer */ +- max_align_t data[1]; /* not allocated, see below */ ++ h_max_align_t data[1]; /* not allocated, see below */ + + } hblock_t; +
Only in /scratch/sw/pkgsrc-2015Q2/print/luatex/: CVS
diff -ru /scratch/sw/pkgsrc-2015Q2/print/luatex/Makefile pkgsrc/print/luatex/Makefile
--- /scratch/sw/pkgsrc-2015Q2/print/luatex/Makefile 2015-06-15 11:45:39.000000000 +0200
+++ pkgsrc/print/luatex/Makefile 2015-08-09 09:46:49.266655940 +0200
@@ -103,7 +103,7 @@
CONFIGURE_DIRS+=. texk/web2c
MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q}
-CFLAGS+= -I${BUILDLINK_PREFIX.kpathsea}/lib
+CPPFLAGS+= -I${BUILDLINK_PREFIX.kpathsea}/lib
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= post-configure
Only in /scratch/sw/pkgsrc-2015Q2/print/luatex/patches: CVS
diff -ru ../../../pkgsrc/devel/nbpatch/files/backupfile.c pkgsrc/devel/nbpatch/files/backupfile.c --- ../../../pkgsrc/devel/nbpatch/files/backupfile.c 2008-09-10 20:48:01.000000000 +0200 +++ pkgsrc/devel/nbpatch/files/backupfile.c 2015-08-08 13:11:22.781454944 +0200 @@ -21,6 +21,9 @@ * David MacKenzie <djm%ai.mit.edu@localhost>. Some algorithms adapted from GNU Emacs. */ +/* asprintf() is a GNU extension */ +#define _GNU_SOURCE + #if HAVE_CONFIG_H #include "config.h" #endif diff -ru ../../../pkgsrc/devel/nbpatch/files/patch.c pkgsrc/devel/nbpatch/files/patch.c --- ../../../pkgsrc/devel/nbpatch/files/patch.c 2009-04-29 15:41:16.000000000 +0200 +++ pkgsrc/devel/nbpatch/files/patch.c 2015-08-08 13:12:59.963702048 +0200 @@ -30,6 +30,9 @@ * behaviour */ +/* asprintf() is a GNU extension */ +#define _GNU_SOURCE + #if HAVE_CONFIG_H #include "config.h" #endif
--- pkgsrc-2014Q3/mk/mpi.buildlink3.mk 2010-05-16 13:07:39.000000000 +0200
+++ pkgsrc/mk/mpi.buildlink3.mk 2015-07-12 12:06:44.000000000 +0200
@@ -9,7 +9,7 @@
# MPI_TYPE
# This value represents the type of MPI we wish to use on the system.
#
-# Possible: mpich, openmpi
+# Possible: mpich, openmpi, native
# Default: mpich
.if !defined(MPI_BUILDLINK3_MK)
@@ -17,14 +17,18 @@
.include "../../mk/bsd.prefs.mk"
+
# Try to find if we have anything installed already
.if exists($(LOCALBASE)/bin/mpicc)
_MPI_PACKAGE!= $(PKG_INFO) -Q PKGPATH -F $(LOCALBASE)/bin/mpicc
MPI_TYPE?= $(_MPI_PACKAGE:T)
-.else
+.endif
MPI_TYPE?= mpich # default to MPICH due to backward compatibility
-.if $(MPI_TYPE) == "mpich"
+
+.if $(MPI_TYPE) == "native"
+# nothing
+.elif $(MPI_TYPE) == "mpich"
_MPI_PACKAGE= parallel/mpi-ch
.elif $(MPI_TYPE) == "openmpi"
_MPI_PACKAGE= parallel/openmpi
@@ -32,8 +36,9 @@
PKG_FAIL_REASON= \
"${MPI_TYPE} is not an acceptable MPI type for ${PKGNAME}."
.endif
-.endif
+.if defined(_MPI_PACKAGE)
.include "../../$(_MPI_PACKAGE)/buildlink3.mk"
+.endif
.endif # MPI_BUILDLINK3_MK
diff -ruN pkgsrc-2014Q3/security/mit-krb5/builtin.mk pkgsrc/security/mit-krb5/builtin.mk --- pkgsrc-2014Q3/security/mit-krb5/builtin.mk 2014-02-28 13:17:20.000000000 +0100 +++ pkgsrc/security/mit-krb5/builtin.mk 2015-06-17 13:16:29.979513335 +0200 @@ -10,10 +10,13 @@ BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h .elif !empty(MACHINE_PLATFORM:MSunOS-*-*) BUILTIN_FIND_HEADERS.H_MIT_KRB5= kerberosv5/krb5.h +.elif !empty(MACHINE_PLATFORM:MLinux-*) +# Assuming mit-krb5 >= 1.5 on GNU/Linux. +BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h .else BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5.h .endif -BUILTIN_FIND_GREP.H_MIT_KRB5= Massachusetts Institute of Technology +BUILTIN_FIND_GREP.H_MIT_KRB5= Massachusetts BUILTIN_FIND_FILES_VAR:= SH_KRB5_CONFIG BUILTIN_FIND_FILES.SH_KRB5_CONFIG= /usr/bin/krb5-config BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version)
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
Attachment:
pkgtools-p5-pkgsrc-Dewey-failure-nbcompat.log.bz2
Description: application/bzip
Attachment:
smime.p7s
Description: S/MIME cryptographic signature