From 2c00cbac50c58b1fb6526330291e99e987792fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 14 May 2019 10:59:51 +0200 Subject: [PATCH] gcc: update to 9.1.0 Remove libmpx{,-devel} as they are no longer supported. [ci skip] --- common/shlibs | 6 +- .../gcc/patches/0016-invalid_tls_model.diff | 51 ------ srcpkgs/gcc/patches/musl-ada.patch | 87 +++++----- srcpkgs/gcc/patches/non-nullness.patch | 88 ++++++++++ srcpkgs/gcc/template | 153 ++++++++++-------- srcpkgs/libmpx | 1 - srcpkgs/libmpx-devel | 1 - 7 files changed, 211 insertions(+), 176 deletions(-) delete mode 100644 srcpkgs/gcc/patches/0016-invalid_tls_model.diff create mode 100644 srcpkgs/gcc/patches/non-nullness.patch delete mode 120000 srcpkgs/libmpx delete mode 120000 srcpkgs/libmpx-devel diff --git a/common/shlibs b/common/shlibs index 199b9fcfc3e..b8149de6481 100644 --- a/common/shlibs +++ b/common/shlibs @@ -57,7 +57,7 @@ libcc1plugin.so.0 gcc-6.2.1_1 libitm.so.1 libitm-4.7.3_1 liblto_plugin.so.0 gcc-4.7.3_1 libgcc_s.so.1 libgcc-4.4.0_1 -libgo.so.13 libgo-8.2.0_1 +libgo.so.14 libgo-9.1.0_1 libmpx.so.2 libmpx-6.2.1_1 libmpxwrappers.so.2 libmpx-6.2.1_1 libperl.so.5.28 perl-5.28.0_1 @@ -863,8 +863,8 @@ libgdkmm-2.4.so.1 gtkmm2-2.24.0_1 libgtkmm-2.4.so.1 gtkmm2-2.24.0_1 libquadmath.so.0 libquadmath-4.4.0_1 libgfortran.so.5 libgfortran-8.2.0_1 -libgnarl-8.so libada-8.2.0_5 -libgnat-8.so libada-8.2.0_5 +libgnarl-9.so libada-9.1.0_1 +libgnat-9.so libada-9.1.0_1 libmozjs185.so.1.0 js-1.8.5_1 libwebp.so.7 libwebp-0.6.0_1 libwebpmux.so.3 libwebp-0.6.0_1 diff --git a/srcpkgs/gcc/patches/0016-invalid_tls_model.diff b/srcpkgs/gcc/patches/0016-invalid_tls_model.diff deleted file mode 100644 index b3fe841e207..00000000000 --- a/srcpkgs/gcc/patches/0016-invalid_tls_model.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- ./libgomp/configure.tgt.orig 2018-09-25 13:44:16.654561098 -0400 -+++ ./libgomp/configure.tgt 2018-09-25 13:44:50.452688100 -0400 -@@ -10,23 +10,6 @@ - # XCFLAGS Add extra compile flags to use. - # XLDFLAGS Add extra link flags to use. - --# Optimize TLS usage by avoiding the overhead of dynamic allocation. --if test $gcc_cv_have_tls = yes ; then -- case "${target}" in -- -- *-*-k*bsd*-gnu*) -- ;; -- -- *-*-linux* | *-*-gnu*) -- XCFLAGS="${XCFLAGS} -ftls-model=initial-exec" -- ;; -- -- *-*-rtems*) -- XCFLAGS="${XCFLAGS} -ftls-model=local-exec" -- ;; -- esac --fi -- - # Since we require POSIX threads, assume a POSIX system by default. - config_path="posix" - ---- ./libitm/configure.tgt.orig 2018-09-25 13:47:31.019296903 -0400 -+++ ./libitm/configure.tgt 2018-09-25 13:47:37.676322335 -0400 -@@ -27,22 +27,6 @@ - # XCFLAGS Add extra compile flags to use. - # XLDFLAGS Add extra link flags to use. - --# Optimize TLS usage by avoiding the overhead of dynamic allocation. --if test "$gcc_cv_have_tls" = yes ; then -- case "${target}" in -- -- # For x86, we use slots in the TCB head for most of our TLS. -- # The setup of those slots in beginTransaction can afford to -- # use the global-dynamic model. -- i[456]86-*-linux* | x86_64-*-linux*) -- ;; -- -- *-*-linux*) -- XCFLAGS="${XCFLAGS} -ftls-model=initial-exec" -- ;; -- esac --fi -- - # Map the target cpu to an ARCH sub-directory. At the same time, - # work out any special compilation flags as necessary. - case "${target_cpu}" in diff --git a/srcpkgs/gcc/patches/musl-ada.patch b/srcpkgs/gcc/patches/musl-ada.patch index 5e6f2f77d2b..5e91b0476a3 100644 --- a/srcpkgs/gcc/patches/musl-ada.patch +++ b/srcpkgs/gcc/patches/musl-ada.patch @@ -124,51 +124,9 @@ index 0d12f7e..a063b47 100644 #endif #if defined (_WIN32) -diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c -index 7025f57..207b50d 100644 ---- gcc/ada/terminals.c -+++ gcc/ada/terminals.c -@@ -1108,13 +1108,6 @@ __gnat_setup_winsize (void *desc, int rows, int columns) - #include - #include - --/* On some system termio is either absent or including it will disable termios -- (HP-UX) */ --#if !defined (__hpux__) && !defined (BSD) && !defined (__APPLE__) \ -- && !defined (__rtems__) && !defined (__QNXNTO__) --# include --#endif -- - #include - #include - #include -diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c -index 207b50d..bd3a02c 100644 ---- gcc/ada/terminals.c -+++ gcc/ada/terminals.c -@@ -1152,7 +1152,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns) - #if defined (__APPLE__) || defined (BSD) - #define USE_OPENPTY - #elif defined (__linux__) --#define USE_GETPT -+#define USE_POSIX_OPENPT - #elif defined (__sun__) - #define USE_CLONE_DEVICE "/dev/ptmx" - #elif defined (_AIX) -@@ -1201,8 +1201,8 @@ allocate_pty_desc (pty_desc **desc) { - int master_fd = -1; - char *slave_name = NULL; - --#ifdef USE_GETPT -- master_fd = getpt (); -+#ifdef USE_POSIX_OPENPT -+ master_fd = posix_openpt(O_RDWR | O_NOCTTY); - #elif defined (USE_OPENPTY) - status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL); - #elif defined (USE_CLONE_DEVICE) ---- gcc/ada/gcc-interface/Makefile.in -+++ gcc/ada/gcc-interface/Makefile.in -@@ -1028,7 +1028,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),) +--- gcc/ada/Makefile.rtl 2019-05-14 21:18:45.217455681 +0200 ++++ gcc/ada/Makefile.rtl 2019-05-14 21:21:30.686464218 +0200 +@@ -1521,7 +1521,7 @@ s-tpopsp.adb +Upstream: yes +Reason: PR tree-optimization/90949 +* tree-ssa-copy.c (fini_copy_prop): Use reset_flow_sensitive_info. +* tree-ssanames.c (reset_flow_sensitive_info): Reset non-null state. + +--- gcc/tree-ssa-copy.c 2019-01-01 13:31:55.000000000 +0100 ++++ gcc/tree-ssa-copy.c 2019-06-26 18:50:01.030395471 +0200 +@@ -545,13 +545,12 @@ + duplicate_ssa_name_ptr_info (copy_of[i].value, + SSA_NAME_PTR_INFO (var)); + /* Points-to information is cfg insensitive, +- but alignment info might be cfg sensitive, if it +- e.g. is derived from VRP derived non-zero bits. +- So, do not copy alignment info if the two SSA_NAMEs +- aren't defined in the same basic block. */ ++ but [E]VRP might record context sensitive alignment ++ info, non-nullness, etc. So reset context sensitive ++ info if the two SSA_NAMEs aren't defined in the same ++ basic block. */ + if (var_bb != copy_of_bb) +- mark_ptr_info_alignment_unknown +- (SSA_NAME_PTR_INFO (copy_of[i].value)); ++ reset_flow_sensitive_info (copy_of[i].value); + } + else if (!POINTER_TYPE_P (TREE_TYPE (var)) + && SSA_NAME_RANGE_INFO (var) +--- gcc/tree-ssanames.c 2019-03-18 14:59:11.000000000 +0100 ++++ gcc/tree-ssanames.c 2019-06-26 18:50:11.282394906 +0200 +@@ -820,7 +820,12 @@ + { + /* points-to info is not flow-sensitive. */ + if (SSA_NAME_PTR_INFO (name)) +- mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name)); ++ { ++ /* [E]VRP can derive context sensitive alignment info and ++ non-nullness properties. We must reset both. */ ++ mark_ptr_info_alignment_unknown (SSA_NAME_PTR_INFO (name)); ++ SSA_NAME_PTR_INFO (name)->pt.null = 1; ++ } + } + else + SSA_NAME_RANGE_INFO (name) = NULL; +--- /dev/null ++++ gcc/testsuite/gcc.c-torture/pr90949.c 2019-06-26 18:53:16.870384679 +0200 +@@ -0,0 +1,42 @@ ++void __attribute__ ((noipa, noinline)) my_puts (const char *str) { } ++ ++void __attribute__ ((noipa, noinline)) my_free (void *p) { } ++ ++ ++struct Node ++{ ++ struct Node *child; ++}; ++ ++struct Node space[2] = { }; ++ ++struct Node * __attribute__ ((noipa, noinline)) my_malloc (int bytes) ++{ ++ return &space[0]; ++} ++ ++void ++walk (struct Node *module, int cleanup) ++{ ++ if (module == 0) ++ { ++ return; ++ } ++ if (!cleanup) ++ { ++ my_puts ("No cleanup"); ++ } ++ walk (module->child, cleanup); ++ if (cleanup) ++ { ++ my_free (module); ++ } ++} ++ ++int ++main () ++{ ++ struct Node *node = my_malloc (sizeof (struct Node)); ++ node->child = 0; ++ walk (node, 1); ++} diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 4b8695b0293..56d1cf38dd4 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -1,25 +1,26 @@ # Template file for 'gcc' -_majorver=8.3 +_majorver=9 +_minorver=${_majorver}.1 _gmp_version=6.1.2 _mpfr_version=4.0.1 _mpc_version=1.1.0 _isl_version=0.19 pkgname=gcc -version=${_majorver}.0 -revision=2 +version=${_minorver}.0 +revision=1 short_desc="GNU Compiler Collection" maintainer="Juan RP " homepage="http://gcc.gnu.org" license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" # *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz distfiles=" - https://fossies.org/linux/misc/gcc-${version}.tar.xz + ${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz https://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz - https://fossies.org/linux/misc/mpc-${_mpc_version}.tar.gz + ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2" -checksum="64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c +checksum="79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e @@ -28,7 +29,7 @@ checksum="64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c nopie=yes lib32disabled=yes bootstrap=yes -replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0" +replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0" alternatives="cc:cc:/usr/bin/gcc" if [ "$CHROOT_READY" ]; then @@ -123,7 +124,7 @@ case "$XBPS_TARGET_MACHINE" in esac case "$XBPS_TARGET_MACHINE" in mips*) ;; - x86_64*|i686) subpackages+=" libitm libitm-devel libmpx libmpx-devel";; + x86_64*|i686) subpackages+=" libitm libitm-devel";; *) subpackages+=" libitm libitm-devel";; esac if [ "$CROSS_BUILD" ]; then @@ -247,10 +248,6 @@ do_configure() { case "$XBPS_TARGET_MACHINE" in *-musl) _args+=" --disable-symvers" _args+=" libat_cv_have_ifunc=no" - if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then - # Remove libmpx because it won't compile - rm -rf libmpx - fi ;; esac @@ -355,14 +352,14 @@ do_install() { # Make version a symlink of major version to make all versions # from the same series work automagically. mv ${DESTDIR}/usr/lib/gcc/${_triplet}/${version} \ - ${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver} - ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver} \ + ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver} + ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver} \ ${DESTDIR}/usr/lib/gcc/${_triplet}/${version} # Ditto for c++ headers. mv ${DESTDIR}/usr/include/c++/${version} \ - ${DESTDIR}/usr/include/c++/${_majorver} - ln -sfr ${DESTDIR}/usr/include/c++/${_majorver} \ + ${DESTDIR}/usr/include/c++/${_minorver} + ln -sfr ${DESTDIR}/usr/include/c++/${_minorver} \ ${DESTDIR}/usr/include/c++/${version} # rpcgen wants /lib/cpp, make a symlink @@ -398,7 +395,7 @@ do_install() { gcc-ada_package() { lib32disabled=yes - depends="gcc>=${_majorver} libada>=${_majorver}" + depends="gcc>=${_minorver} libada>=${_minorver}" short_desc+=" - Ada compiler frontend" pkg_install() { for f in gnat{,bind,chop,clean,find,kr,link,ls,make,name,prep,xref}; do @@ -406,16 +403,17 @@ gcc-ada_package() { done } } + gcc-go_package() { lib32disabled=yes - depends="gcc>=${_majorver} libgo-devel>=${_majorver}" + depends="gcc>=${_minorver} libgo-devel>=${_minorver}" short_desc+=" - Go compiler frontend" pkg_install() { for f in gccgo ${_triplet}-gccgo; do vmove usr/bin/${f} done for f in buildid cgo go1 test2json vet; do - vmove usr/lib/gcc/${_triplet}/${_majorver}/${f} + vmove usr/lib/gcc/${_triplet}/${_minorver}/${f} done vmove usr/share/info/gccgo.info touch ${PKGDESTDIR}/usr/share/info/dir @@ -423,9 +421,10 @@ gcc-go_package() { vmove usr/lib/go } } + gcc-go-tools_package() { lib32disabled=yes - depends="gcc-go>=${_majorver}" + depends="gcc-go>=${_minorver}" short_desc+=" - Go tools" conflicts="go>=0" pkg_install() { @@ -435,22 +434,23 @@ gcc-go-tools_package() { vmove usr/share/man/man1/gofmt.1 } } + gcc-fortran_package() { lib32disabled=yes - depends="gcc>=${_majorver} libgfortran-devel>=${_majorver}" + depends="gcc>=${_minorver} libgfortran-devel>=${_minorver}" short_desc+=" - Fortran compiler frontend" pkg_install() { for f in gfortran ${_triplet}-gfortran; do vmove usr/bin/${f} done - vmove usr/lib/gcc/${_triplet}/${_majorver}/f951 - vmove usr/lib/gcc/${_triplet}/${_majorver}/libcaf_single.a - vmove usr/lib/gcc/${_triplet}/${_majorver}/finclude + vmove usr/lib/gcc/${_triplet}/${_minorver}/f951 + vmove usr/lib/gcc/${_triplet}/${_minorver}/libcaf_single.a + vmove usr/lib/gcc/${_triplet}/${_minorver}/finclude if [ "$CROSS_BUILD" ]; then # A number of OMP modules are not built when cross # compiling gcc. Copy them from the cross compiler. local src="/usr/lib/gcc/${_triplet}/${version}/finclude" - local dst="usr/lib/gcc/${_triplet}/${_majorver}/finclude" + local dst="usr/lib/gcc/${_triplet}/${_minorver}/finclude" for f in omp_lib.f90 omp_lib.h omp_lib.mod omp_lib_kinds.mod \ openacc.f90 openacc.mod openacc_kinds.mod openacc_lib.h; do vinstall ${src}/${f} 644 ${dst}/ @@ -461,60 +461,67 @@ gcc-fortran_package() { vmove usr/share/man/man1/gfortran.1 } } + gcc-objc++_package() { lib32disabled=yes - depends="gcc-objc>=${_majorver}" + depends="gcc-objc>=${_minorver}" short_desc+=" - Objective-C++ support" pkg_install() { - vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus + vmove usr/lib/gcc/${_triplet}/${_minorver}/cc1objplus } } + gcc-objc_package() { lib32disabled=yes - depends="gcc>=${_majorver} libobjc>=${_majorver}" + depends="gcc>=${_minorver} libobjc>=${_minorver}" short_desc+=" - Objective-C support" pkg_install() { - vmove usr/lib/gcc/${_triplet}/${_majorver}/include/objc - vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1obj + vmove usr/lib/gcc/${_triplet}/${_minorver}/include/objc + vmove usr/lib/gcc/${_triplet}/${_minorver}/cc1obj } } + libada-devel_package() { - depends="libada>=${_majorver}" + depends="libada>=${_minorver}" short_desc+=" - Ada library - development files" pkg_install() { - vmove usr/lib/gcc/${_triplet}/${_majorver}/adainclude - vmove usr/lib/gcc/${_triplet}/${_majorver}/plugin/include/ada + vmove usr/lib/gcc/${_triplet}/${_minorver}/adainclude + vmove usr/lib/gcc/${_triplet}/${_minorver}/plugin/include/ada } } + libada_package() { short_desc+=" - Ada library" pkg_install() { - vmove usr/lib/gcc/${_triplet}/${_majorver}/adalib - mv -v ${PKGDESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/adalib/libgna{rl,t}{,-8}.so \ + vmove usr/lib/gcc/${_triplet}/${_minorver}/adalib + mv -v ${PKGDESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/adalib/libgna{rl,t}{,-${_majorver}}.so \ ${PKGDESTDIR}/usr/lib } } + libgfortran-devel_package() { - depends="libgfortran>=${_majorver}" + depends="libgfortran>=${_minorver}" short_desc+=" - Fortran library - development files" pkg_install() { + vmove usr/lib/libgfortran.spec vmove usr/lib/libgfortran.a # This does not seem to exist anymore? - if [ -f usr/lib/gcc/${_triplet}/${_majorver}/libgfortranbegin.a ]; then - vmove usr/lib/gcc/${_triplet}/${_majorver}/libgfortranbegin.a + if [ -f usr/lib/gcc/${_triplet}/${_minorver}/libgfortranbegin.a ]; then + vmove usr/lib/gcc/${_triplet}/${_minorver}/libgfortranbegin.a fi } } + libgfortran_package() { short_desc+=" - Fortran library" pkg_install() { vmove "usr/lib/libgfortran.so*" - vmove usr/lib/libgfortran.spec vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION } } + libgo-devel_package() { - depends="libgo>=${_majorver}" + depends="libgo>=${_minorver}" short_desc+=" - Go library - development files" pkg_install() { vmove usr/lib/libgo.a @@ -523,6 +530,7 @@ libgo-devel_package() { vmove usr/lib/libgo.so } } + libgo_package() { short_desc+=" - Go library" pkg_install() { @@ -530,13 +538,15 @@ libgo_package() { vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION } } + libobjc-devel_package() { - depends="libobjc>=${_majorver}" + depends="libobjc>=${_minorver}" short_desc+=" - Objective-C library - development files" pkg_install() { vmove "usr/lib/libobjc.*a" } } + libobjc_package() { short_desc+=" - Objective-C library" pkg_install() { @@ -544,16 +554,18 @@ libobjc_package() { vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION } } + libquadmath-devel_package() { - depends="libquadmath>=${_majorver}" + depends="libquadmath>=${_minorver}" short_desc+=" - quadmath library - development files" pkg_install() { - vmove "usr/lib/gcc/${_triplet}/${_majorver}/include/quadmath*" + vmove "usr/lib/gcc/${_triplet}/${_minorver}/include/quadmath*" vmove "usr/lib/libquadmath*.a" vmove usr/share/info/libquadmath.info touch ${PKGDESTDIR}/usr/share/info/dir } } + libquadmath_package() { short_desc+=" - quadmath library" pkg_install() { @@ -561,34 +573,39 @@ libquadmath_package() { vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION } } + libvtv-devel_package() { - depends="libvtv>=${_majorver}" + depends="libvtv>=${_minorver}" short_desc+=" - Vtable Verification Runtime Library - development files" pkg_install() { vmove usr/lib/libvtv.a vmove usr/lib/libvtv.so } } + libvtv_package() { short_desc+=" - Vtable Verification Runtime Library" pkg_install() { vmove usr/lib/libvtv.so.* } } + libatomic-devel_package() { - depends="libatomic>=${_majorver}" + depends="libatomic>=${_minorver}" short_desc+=" - Atomics library - development files" pkg_install() { vmove usr/lib/libatomic.a vmove usr/lib/libatomic.so } } + libatomic_package() { short_desc+=" - Atomics library" pkg_install() { vmove usr/lib/libatomic.so.* } } + libgcc_package() { short_desc+=" - GCC library" replaces="libgcj<7.2.0 libcilkrts<8.2.0" @@ -598,20 +615,22 @@ libgcc_package() { vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION } } + libgcc-devel_package() { depends="libgcc-${version}_${revision}" short_desc+=" - GCC library - development files" replaces="libgcj-devel<7.2.0 libcilkrts-devel<8.2.0" pkg_install() { - vmove "usr/lib/gcc/${_triplet}/${_majorver}/*.o" - vmove "usr/lib/gcc/${_triplet}/${_majorver}/*.a" + vmove "usr/lib/gcc/${_triplet}/${_minorver}/*.o" + vmove "usr/lib/gcc/${_triplet}/${_minorver}/*.a" } } + libgomp-devel_package() { - depends="libgomp>=${_majorver}" + depends="libgomp>=${_minorver}" short_desc+=" - OpenMP v4.0 library - development files" pkg_install() { - vmove usr/lib/gcc/${_triplet}/${_majorver}/include/omp.h + vmove usr/lib/gcc/${_triplet}/${_minorver}/include/omp.h vmove usr/lib/libgomp.so vmove usr/lib/libgomp.a vmove usr/lib/libgomp.spec @@ -619,6 +638,7 @@ libgomp-devel_package() { touch ${PKGDESTDIR}/usr/share/info/dir } } + libgomp_package() { short_desc+=" - OpenMP v4.0 library" pkg_install() { @@ -626,8 +646,9 @@ libgomp_package() { vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION } } + libitm-devel_package() { - depends="libitm>=${_majorver}" + depends="libitm>=${_minorver}" short_desc+=" - Transactional Memory library - development files" replaces="libitm<4.9.0_1" pkg_install() { @@ -638,31 +659,16 @@ libitm-devel_package() { touch ${PKGDESTDIR}/usr/share/info/dir } } + libitm_package() { short_desc+=" - Transactional Memory library" pkg_install() { vmove "usr/lib/libitm.so.*" } } -libmpx-devel_package() { - depends="libmpx>=${_majorver}" - short_desc+=" - Intel MPX support - development files" - pkg_install() { - vmove usr/lib/libmpx.a - vmove usr/lib/libmpx.so - vmove usr/lib/libmpxwrappers.so - vmove usr/lib/libmpxwrappers.a - } -} -libmpx_package() { - short_desc+=" - Intel MPX support" - pkg_install() { - vmove usr/lib/libmpx.so.* - vmove usr/lib/libmpxwrappers.so.* - } -} + libsanitizer-devel_package() { - depends="libsanitizer>=${_majorver}" + depends="libsanitizer>=${_minorver}" short_desc+=" - Sanitizer libraries - development files" pkg_install() { vmove "usr/lib/lib*san*.so" @@ -671,20 +677,23 @@ libsanitizer-devel_package() { vmove usr/lib/libsanitizer.spec } } + libsanitizer_package() { short_desc+=" - Sanitizer libraries" pkg_install() { vmove "usr/lib/lib*san*.so.*" } } + libssp-devel_package() { - depends="libssp>=${_majorver}" + depends="libssp>=${_minorver}" short_desc+=" - SSP (StackSmashingProtection) library - development files" pkg_install() { vmove "usr/lib/libssp*.a" - vmove usr/lib/gcc/${_triplet}/${_majorver}/include/ssp + vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp } } + libssp_package() { short_desc+=" - SSP (StackSmashingProtection) library" pkg_install() { @@ -692,8 +701,9 @@ libssp_package() { vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION } } + libstdc++-devel_package() { - depends="libstdc++>=${_majorver}" + depends="libstdc++>=${_minorver}" short_desc+=" - Standard C++ Library - development files" pkg_install() { vmove "usr/lib/libstdc++.*a" @@ -701,6 +711,7 @@ libstdc++-devel_package() { vmove usr/include/c++ } } + libstdc++_package() { short_desc+=" - Standard C++ Library" pkg_install() { diff --git a/srcpkgs/libmpx b/srcpkgs/libmpx deleted file mode 120000 index b08d5af5795..00000000000 --- a/srcpkgs/libmpx +++ /dev/null @@ -1 +0,0 @@ -gcc \ No newline at end of file diff --git a/srcpkgs/libmpx-devel b/srcpkgs/libmpx-devel deleted file mode 120000 index b08d5af5795..00000000000 --- a/srcpkgs/libmpx-devel +++ /dev/null @@ -1 +0,0 @@ -gcc \ No newline at end of file