diff options
| author | tijl <tijl@FreeBSD.org> | 2019-09-08 21:47:42 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2019-09-08 21:47:42 +0800 |
| commit | 69ab30c6cfe8c825002deceacd95f3a635dfb640 (patch) | |
| tree | 1f617608b8d888bd9b07191b90ea6f7aac9032c1 /devel | |
| parent | 55a4360182549855305bae5e00364e303e374e75 (diff) | |
| download | freebsd-ports-gnome-69ab30c6cfe8c825002deceacd95f3a635dfb640.tar.gz freebsd-ports-gnome-69ab30c6cfe8c825002deceacd95f3a635dfb640.tar.zst freebsd-ports-gnome-69ab30c6cfe8c825002deceacd95f3a635dfb640.zip | |
Don't install the i386 package of libstdc++-devel on amd64. The amd64
package already contains the necessary bits.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/linux-c7-devtools/Makefile | 6 | ||||
| -rw-r--r-- | devel/linux-c7-devtools/pkg-plist.amd64 | 25 |
2 files changed, 3 insertions, 28 deletions
diff --git a/devel/linux-c7-devtools/Makefile b/devel/linux-c7-devtools/Makefile index 7356f08c9b18..0651f1fecf6d 100644 --- a/devel/linux-c7-devtools/Makefile +++ b/devel/linux-c7-devtools/Makefile @@ -3,7 +3,7 @@ PORTNAME= devtools PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MAINTAINER= emulation@FreeBSD.org @@ -22,11 +22,11 @@ BIN_DISTNAMES= binutils-2.27-34.base.el7 \ cpp-4.8.5-36.el7_6.2 \ gcc-4.8.5-36.el7_6.2 \ gcc-c++-4.8.5-36.el7_6.2 \ - gcc-gfortran-4.8.5-36.el7_6.2 + gcc-gfortran-4.8.5-36.el7_6.2 \ + libstdc++-devel-4.8.5-36.el7_6.2 LIB_DISTNAMES= binutils-devel-2.27-34.base.el7 \ glibc-devel-2.17-260.el7_6.6 \ glibc-static-2.17-260.el7_6.6 \ - libstdc++-devel-4.8.5-36.el7_6.2 \ libgomp-4.8.5-36.el7_6.2 \ libmpc-1.0.1-3.el7 DISTFILES_amd64=${LIB_DISTNAMES:S/$/${EXTRACT_SUFX_i386}:amd64,i386/} \ diff --git a/devel/linux-c7-devtools/pkg-plist.amd64 b/devel/linux-c7-devtools/pkg-plist.amd64 index 25c8b73da896..ea427f7ae9dc 100644 --- a/devel/linux-c7-devtools/pkg-plist.amd64 +++ b/devel/linux-c7-devtools/pkg-plist.amd64 @@ -734,29 +734,6 @@ usr/include/c++/4.8.2/forward_list usr/include/c++/4.8.2/fstream usr/include/c++/4.8.2/functional usr/include/c++/4.8.2/future -usr/include/c++/4.8.2/i686-redhat-linux/bits/atomic_word.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/basic_file.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/c++allocator.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/c++config.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/c++io.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/c++locale.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/cpu_defines.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/ctype_base.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/ctype_inline.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/cxxabi_tweaks.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/error_constants.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/extc++.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr-default.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr-posix.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr-single.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/gthr.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/messages_members.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/opt_random.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/os_defines.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/stdc++.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/stdtr1c++.h -usr/include/c++/4.8.2/i686-redhat-linux/bits/time_members.h -usr/include/c++/4.8.2/i686-redhat-linux/ext/opt_random.h usr/include/c++/4.8.2/initializer_list usr/include/c++/4.8.2/iomanip usr/include/c++/4.8.2/ios @@ -1955,8 +1932,6 @@ usr/lib/cpp usr/lib/crt1.o usr/lib/crti.o usr/lib/crtn.o -usr/lib/gcc/i686-redhat-linux/4.8.2/libstdc++.so -usr/lib/gcc/i686-redhat-linux/4.8.5 usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/crtbegin.o usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/crtbeginS.o usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/crtbeginT.o |