diff options
| author | rene <rene@FreeBSD.org> | 2017-01-03 15:24:49 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2017-01-03 15:24:49 +0800 |
| commit | f70517de66784048e94c506d94acedd3be9a45e8 (patch) | |
| tree | 9171a32031ba4f5598a8ae32c75b45077e8a9480 /Mk/Uses | |
| parent | 51579fca5ad8a3fb1982d0b28e47aa4d515d4edf (diff) | |
| download | freebsd-ports-gnome-f70517de66784048e94c506d94acedd3be9a45e8.tar.gz freebsd-ports-gnome-f70517de66784048e94c506d94acedd3be9a45e8.tar.zst freebsd-ports-gnome-f70517de66784048e94c506d94acedd3be9a45e8.zip | |
Remove support for FreeBSD < 10.3 from Mk/*
This does not yet convert the files to bmake.
Reviewed by: mat
Differential Revision: https://reviews.freebsd.org/D9016
Diffstat (limited to 'Mk/Uses')
| -rw-r--r-- | Mk/Uses/7z.mk | 5 | ||||
| -rw-r--r-- | Mk/Uses/compiler.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/iconv.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/linux.mk | 4 |
4 files changed, 4 insertions, 15 deletions
diff --git a/Mk/Uses/7z.mk b/Mk/Uses/7z.mk index 3a5be240f975..a12cb7af367c 100644 --- a/Mk/Uses/7z.mk +++ b/Mk/Uses/7z.mk @@ -23,11 +23,6 @@ P7ZIP_WRKDIR?= ${EXTRACT_WRKDIR} IGNORE= USES=7z has invalid arguments: ${7z_ARGS:Np7zip:Npartial} .endif -.if ! ${7z_ARGS:Mp7zip} && (${OPSYS} == FreeBSD && ${OSVERSION} < 1000009) -# libarchive lacks 7zip reader, fallback to P7ZIP_CMD -7z_ARGS+= p7zip -.endif - .if ${7z_ARGS:Mp7zip} EXTRACT_DEPENDS+= ${P7ZIP_CMD}:archivers/p7zip .endif diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index 20cd2883e2f4..b4575f235573 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -241,18 +241,12 @@ CXX= ${LOCALBASE}/bin/clang++34 USE_GCC= yes CHOSEN_COMPILER_TYPE= gcc .if ${COMPILER_FEATURES:Mlibc++} -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1001508 -LDFLAGS+= -L${LOCALBASE}/lib/c++ -CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 -BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -.else CXXFLAGS+= -nostdinc++ -isystem /usr/include/c++/v1 LDFLAGS+= -L${WRKDIR} _USES_configure+= 200:gcc-libc++-configure gcc-libc++-configure: @${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so -.endif # OSVERSION < 1001508 .endif .endif diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk index 7f808dc30616..a8275442276b 100644 --- a/Mk/Uses/iconv.mk +++ b/Mk/Uses/iconv.mk @@ -41,8 +41,8 @@ ICONV_CONFIGURE_BASE= ICONV_INCLUDE_PATH= /usr/include ICONV_LIB_PATH= /usr/lib/libc.so -.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \ - || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \ +.if (${OPSYS} == FreeBSD && \ + (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069)) \ || exists(${LOCALBASE}/include/iconv.h) BUILD_DEPENDS+= libiconv>=1.14_9:converters/libiconv ICONV_INCLUDE_PATH= ${LOCALBASE}/include diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk index 480b8ed94ff4..3879843a010b 100644 --- a/Mk/Uses/linux.mk +++ b/Mk/Uses/linux.mk @@ -40,9 +40,9 @@ IGNORE= Invalid Linux distribution: ${linux_ARGS} .if ${LINUX_DEFAULT:M*_64} LINUX_ARCH= x86_64 LINUX_ARCH32= i386 -.if ${ARCH} != amd64 || ${OPSYS} != FreeBSD || ${OSVERSION} < 1002507 \ +.if ${ARCH} != amd64 || ${OPSYS} != FreeBSD \ || ( ${OSVERSION} >= 1100000 && ${OSVERSION} < 1100105 ) -IGNORE= Linux ${LINUX_DEFAULT} is only supported on FreeBSD/amd64 10.3 or higher +IGNORE= Linux ${LINUX_DEFAULT} is unsupported on pre-release versions of FreeBSD 11. Update to 11.0-RELEASE or higher. .endif .else LINUX_ARCH= i386 |