From bfab4686fe9f1b7ad3ba3cfec2bf16fcdc9fe911 Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Fri, 30 Sep 2022 22:16:07 +0200 Subject: [PATCH] cleanup: Remove expired ports: 2022-09-30 devel/flang: Very outdated and unsupported upstream, current version in tree is several years old and upstream is still active --- MOVED | 1 + devel/Makefile | 1 - devel/flang/Makefile | 59 ------------------- devel/flang/distinfo | 3 - devel/flang/files/patch-CMakeLists.txt | 41 ------------- .../files/patch-runtime_flang_CMakeLists.txt | 11 ---- devel/flang/files/patch-runtime_flang_async.c | 14 ----- .../flang/files/patch-runtime_flang_stime3f.c | 17 ------ .../files/patch-runtime_flangrti_dumpregs.h | 11 ---- .../files/patch-runtime_flangrti_iostdinit.c | 28 --------- .../files/patch-runtime_flangrti_mpmalloc.c | 11 ---- .../files/patch-runtime_flangrti_trace__lin.c | 29 --------- ...-runtime_flangrti_x86__64-Linux_dumpregs.c | 11 ---- .../files/patch-tools_flang2_CMakeLists.txt | 13 ---- ...atch-tools_flang2_flang2exe_CMakeLists.txt | 11 ---- devel/flang/pkg-descr | 1 - devel/flang/pkg-plist | 23 -------- 17 files changed, 1 insertion(+), 284 deletions(-) delete mode 100644 devel/flang/Makefile delete mode 100644 devel/flang/distinfo delete mode 100644 devel/flang/files/patch-CMakeLists.txt delete mode 100644 devel/flang/files/patch-runtime_flang_CMakeLists.txt delete mode 100644 devel/flang/files/patch-runtime_flang_async.c delete mode 100644 devel/flang/files/patch-runtime_flang_stime3f.c delete mode 100644 devel/flang/files/patch-runtime_flangrti_dumpregs.h delete mode 100644 devel/flang/files/patch-runtime_flangrti_iostdinit.c delete mode 100644 devel/flang/files/patch-runtime_flangrti_mpmalloc.c delete mode 100644 devel/flang/files/patch-runtime_flangrti_trace__lin.c delete mode 100644 devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c delete mode 100644 devel/flang/files/patch-tools_flang2_CMakeLists.txt delete mode 100644 devel/flang/files/patch-tools_flang2_flang2exe_CMakeLists.txt delete mode 100644 devel/flang/pkg-descr delete mode 100644 devel/flang/pkg-plist diff --git a/MOVED b/MOVED index 9ddffc7c044ae..c453b26e03996 100644 --- a/MOVED +++ b/MOVED @@ -17563,3 +17563,4 @@ java/bootstrap-openjdk6|java/bootstrap-openjdk8|2022-09-25|Was only used to boot graphics/caffe|misc/caffe|2022-09-29|Move to a more appropriate category security/pwman3||2022-09-30|Has expired: Depends on expired security/py-pycrypto sysutils/py-ansible-base||2022-09-30|Has expired: Depends on expired security/py-pycrypto +devel/flang||2022-09-30|Has expired: Very outdated and unsupported upstream, current version in tree is several years old and upstream is still active diff --git a/devel/Makefile b/devel/Makefile index 710c948f2c95e..c569a28549315 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -626,7 +626,6 @@ SUBDIR += fire-hpp SUBDIR += firmware-utils SUBDIR += fistgen - SUBDIR += flang SUBDIR += flang-clang SUBDIR += flatbuffers SUBDIR += flatbuffers205 diff --git a/devel/flang/Makefile b/devel/flang/Makefile deleted file mode 100644 index 4d7a1d92eb8f2..0000000000000 --- a/devel/flang/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -PORTNAME= flang -DISTVERSION= 7.0-g20191020 -PORTREVISION= 1 -CATEGORIES= devel - -MAINTAINER= jmd@FreeBSD.org -COMMENT= Fortran compiler targeting LLVM -WWW= https://github.com/flang-compiler/flang - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -DEPRECATED= Very outdated and unsupported upstream, current version in tree is several years old and upstream is still active -EXPIRATION_DATE=2022-09-30 - -ONLY_FOR_ARCHS= amd64 - -LLVM_VER= 70 -BUILD_DEPENDS= llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} \ - flang-clang>=0:devel/flang-clang -RUN_DEPENDS= llvm${LLVM_VER}>=0:devel/llvm${LLVM_VER} \ - flang-clang>=0:devel/flang-clang -LIB_DEPENDS= libpgmath.so:math/libpgmath - -USES= cmake:noninja compiler:c++11-lib libedit perl5 tar:xz \ - shebangfix -_USES_PYTHON?= python:build -USES+= ${_USES_PYTHON} -USE_LDCONFIG= ${PREFIX}/flang/lib - -USE_GITHUB= yes -GH_ACCOUNT= flang-compiler -GH_TAGNAME= d07daf3 - -CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_VER} \ - -DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \ - -DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \ - -DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang \ - -DFLANG_LIBOMP=${LOCALBASE}/llvm${LLVM_VER}/lib/libomp.so \ - -DLIBPGMATH="${LOCALBASE}/lib/libpgmath.a" \ - -WWITH_ERROR=OFF - -CMAKE_INSTALL_PREFIX= ${PREFIX}/flang - -# fix on post LLVM11 HEAD -CFLAGS+= -fcommon - -MAKE_JOBS_UNSAFE= yes - -OPTIONS_DEFINE= TESTS - -TESTS_DESC= build unit tests for flang - -TESTS_CMAKE_BOOL= FLANG_INCLUDE_TESTS - -post-patch: - @${CP} -r ${WRKSRC}/tools/flang2/flang2exe/x86_64-Linux ${WRKSRC}/tools/flang2/flang2exe/x86_64-FreeBSD - -.include diff --git a/devel/flang/distinfo b/devel/flang/distinfo deleted file mode 100644 index 9eaab3b724db2..0000000000000 --- a/devel/flang/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1571593984 -SHA256 (flang-compiler-flang-7.0-g20191020-d07daf3_GH0.tar.gz) = 24c54eaad89d1bc3a30fd50b5cd4aa5a563ef8377157c246781681297e19a893 -SIZE (flang-compiler-flang-7.0-g20191020-d07daf3_GH0.tar.gz) = 133245436 diff --git a/devel/flang/files/patch-CMakeLists.txt b/devel/flang/files/patch-CMakeLists.txt deleted file mode 100644 index b5a9de1359005..0000000000000 --- a/devel/flang/files/patch-CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ ---- CMakeLists.txt.orig 2018-09-03 06:03:48 UTC -+++ CMakeLists.txt -@@ -49,6 +49,19 @@ if( ${TARGET_OS} STREQUAL "Linux" ) - message("Unsupported architecture: ${TARGET_ARCHITECTURE}" ) - return() - endif() -+elseif( ${TARGET_OS} STREQUAL "FreeBSD" ) -+ set(OS "FREEBSD") -+ set(OSNAME "FreeBSD") -+ # this is very hacky! -+ if( ${TARGET_ARCHITECTURE} STREQUAL "amd64" ) -+ set(ARCHNAME x86-64) -+ set(ARCH X86) -+ set(WRDSZ 64) -+ set(TARGET_ARCHITECTURE x86_64) -+ else() -+ message("Unsupported architecture: ${TARGET_ARCHITECTURE}" ) -+ return() -+ endif() - else() - message("Unsupported OS: ${TARGET_OS}" ) - return() -@@ -57,7 +70,8 @@ endif() - # The cmake documentation states that these are set. They are not so we - # set them here - set(CMAKE_HOST_SYSTEM_NAME ${TARGET_OS}) --set(CMAKE_HOST_SYSTEM_PROCESSOR ${TARGET_ARCHITECTURE}) -+# also a hack -+set(CMAKE_HOST_SYSTEM_PROCESSOR "x86-64") - - # If we are not building as a part of LLVM, build Flang as an - # standalone project, using LLVM as an external library: -@@ -289,7 +303,7 @@ endif() - # Add appropriate flags for GCC - if (LLVM_COMPILER_IS_GCC_COMPATIBLE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings") -- option(WITH_WERROR "Compile with '-Werror' C compiler flag" ON) -+ option(WITH_WERROR "Compile with '-Werror' C compiler flag" OFF) - if (WITH_WERROR) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") - endif () diff --git a/devel/flang/files/patch-runtime_flang_CMakeLists.txt b/devel/flang/files/patch-runtime_flang_CMakeLists.txt deleted file mode 100644 index 09b63683b190b..0000000000000 --- a/devel/flang/files/patch-runtime_flang_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- runtime/flang/CMakeLists.txt.orig 2019-10-09 20:28:35 UTC -+++ runtime/flang/CMakeLists.txt -@@ -18,7 +18,7 @@ enable_language(C ASM Fortran) # Enable assembly and F - - SET(ASM_OPTIONS "-DLINUX_ELF") - SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS}" ) --SET(CMAKE_SHARED_LINKER_FLAGS "-no-flang-libs") -+SET(CMAKE_SHARED_LINKER_FLAGS "-no-flang-libs -L/usr/lib") - - # We are using Fortran driver to build this library with fresh compiler - # components, so point its binary directory to the build directory to pick up diff --git a/devel/flang/files/patch-runtime_flang_async.c b/devel/flang/files/patch-runtime_flang_async.c deleted file mode 100644 index 2af5c25a7f9f6..0000000000000 --- a/devel/flang/files/patch-runtime_flang_async.c +++ /dev/null @@ -1,14 +0,0 @@ ---- runtime/flang/async.c.orig 2017-10-19 11:03:03 UTC -+++ runtime/flang/async.c -@@ -39,9 +39,10 @@ - #include - #endif - -+#include -+ - #include "stdioInterf.h" - #include "async.h" -- - - #define FIO_MAX_ASYNC_TRANSACTIONS 16 - diff --git a/devel/flang/files/patch-runtime_flang_stime3f.c b/devel/flang/files/patch-runtime_flang_stime3f.c deleted file mode 100644 index 4e8bc9a3e7f2b..0000000000000 --- a/devel/flang/files/patch-runtime_flang_stime3f.c +++ /dev/null @@ -1,17 +0,0 @@ ---- runtime/flang/stime3f.c.orig 2017-10-19 11:03:03 UTC -+++ runtime/flang/stime3f.c -@@ -27,13 +27,7 @@ - - int ENT3F(STIME, stime)(int *tp) - { -- int i; -- time_t t = *tp; -- -- if ((i = stime(&t))) -- i = __io_errno(); -- -- return i; -+ return EPERM; - } - - #endif /* !WINNT */ diff --git a/devel/flang/files/patch-runtime_flangrti_dumpregs.h b/devel/flang/files/patch-runtime_flangrti_dumpregs.h deleted file mode 100644 index 62e0c768540c0..0000000000000 --- a/devel/flang/files/patch-runtime_flangrti_dumpregs.h +++ /dev/null @@ -1,11 +0,0 @@ ---- runtime/flangrti/dumpregs.h.orig 2017-10-19 11:03:03 UTC -+++ runtime/flangrti/dumpregs.h -@@ -21,6 +21,6 @@ - * Declare routines that access the machine registers - */ - --void dumpregs(gregset_t *regs); --gregset_t *getRegs(ucontext_t *u); -+void dumpregs(void *regs); -+void *getRegs(ucontext_t *u); - diff --git a/devel/flang/files/patch-runtime_flangrti_iostdinit.c b/devel/flang/files/patch-runtime_flangrti_iostdinit.c deleted file mode 100644 index c36429a28f0b1..0000000000000 --- a/devel/flang/files/patch-runtime_flangrti_iostdinit.c +++ /dev/null @@ -1,28 +0,0 @@ ---- runtime/flangrti/iostdinit.c.orig 2019-10-09 20:28:35 UTC -+++ runtime/flangrti/iostdinit.c -@@ -163,7 +163,7 @@ __io_ferror(void *p) - int - __io_getfd(void *fp) - { -- return (((FILE *)fp)->_fileno); -+ return (((FILE *)fp)->_file); - } - - /* is a tty? */ -@@ -273,14 +273,14 @@ extern long *_imp___timezone_dll; /* for crtdll.dll */ - #define timezone _timezone /* cygnus, timezone is usually a function */ - #endif - --#elif !defined(DEC) && !defined(IBM) && !defined(ST100_V1_2) && !defined(OSX86) /* !defined(WINNT) */ -+#elif !defined(DEC) && !defined(IBM) && !defined(ST100_V1_2) && !defined(OSX86) && !defined(__FreeBSD__) /* !defined(WINNT) */ - extern time_t timezone; /* for the rest */ - #endif - - int - __io_timezone(void *tm) - { --#if defined(SUN4) || defined(PPC) || defined(OSX86) -+#if defined(SUN4) || defined(PPC) || defined(OSX86) || defined(__FreeBSD__) - return ((struct tm *)tm)->tm_gmtoff; - #elif defined(WINNT) || defined(WIN64) || defined(WIN32) - return (0); diff --git a/devel/flang/files/patch-runtime_flangrti_mpmalloc.c b/devel/flang/files/patch-runtime_flangrti_mpmalloc.c deleted file mode 100644 index 7047d6388c149..0000000000000 --- a/devel/flang/files/patch-runtime_flangrti_mpmalloc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- runtime/flangrti/mpmalloc.c.orig 2019-10-09 20:28:35 UTC -+++ runtime/flangrti/mpmalloc.c -@@ -17,7 +17,7 @@ - - /* mp-safe wrappers for malloc, etc. */ - --#ifdef TARGET_LINUX -+#if defined TARGET_LINUX && !defined(__FreeBSD__) - #include - #endif - diff --git a/devel/flang/files/patch-runtime_flangrti_trace__lin.c b/devel/flang/files/patch-runtime_flangrti_trace__lin.c deleted file mode 100644 index fa886d6fd5e5c..0000000000000 --- a/devel/flang/files/patch-runtime_flangrti_trace__lin.c +++ /dev/null @@ -1,29 +0,0 @@ ---- runtime/flangrti/trace_lin.c.orig 2019-10-09 20:28:35 UTC -+++ runtime/flangrti/trace_lin.c -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - - /* codes and strings for signals */ -@@ -92,7 +92,7 @@ static struct sigs sigs[] = { - {0, CODNULL, NULL} /* end of list */ - }; - --static gregset_t *regs; /* pointer to regs at signal */ -+static void *regs; /* pointer to regs at signal */ - - extern char **__io_get_argv(); - static char ** saved_argv = NULL; -@@ -182,7 +182,7 @@ __abort_trace(int skip) - char **strings; - size_t i; - -- if (regs != (gregset_t *)0) { -+ if (regs != (void *)0) { - dumpregs(regs); - } - diff --git a/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c b/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c deleted file mode 100644 index 3252ebc55dbe0..0000000000000 --- a/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- runtime/flangrti/x86_64-Linux/dumpregs.c.orig 2019-10-09 20:28:35 UTC -+++ runtime/flangrti/x86_64-Linux/dumpregs.c -@@ -42,7 +42,7 @@ - #define RSP 15 - #define RIP 16 - --#if defined(TARGET_OSX) || defined(TARGET_WIN) -+#if defined(TARGET_OSX) || defined(TARGET_WIN) || defined(__FreeBSD__) - /* no gregs and/or ucontext defined in for OSX or Windows */ - void * - getRegs(void *u) diff --git a/devel/flang/files/patch-tools_flang2_CMakeLists.txt b/devel/flang/files/patch-tools_flang2_CMakeLists.txt deleted file mode 100644 index c69cb54aad36b..0000000000000 --- a/devel/flang/files/patch-tools_flang2_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- tools/flang2/CMakeLists.txt.orig 2018-09-04 22:24:01 UTC -+++ tools/flang2/CMakeLists.txt -@@ -33,8 +33,8 @@ set(FLANG2_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/ - - include_directories(${FLANG2_INCLUDE_DIR}) - --if( ${TARGET_OS} STREQUAL "Linux" ) -- if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64" ) -+if( ${TARGET_OS} STREQUAL "Linux|FreeBSD" ) -+ if( ${TARGET_ARCHITECTURE} STREQUAL "x86_64|amd64" ) - set(X86_64 ON) - set(LINUX86 ON) - endif() diff --git a/devel/flang/files/patch-tools_flang2_flang2exe_CMakeLists.txt b/devel/flang/files/patch-tools_flang2_flang2exe_CMakeLists.txt deleted file mode 100644 index 6a8d72a406ac9..0000000000000 --- a/devel/flang/files/patch-tools_flang2_flang2exe_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/flang2/flang2exe/CMakeLists.txt.orig 2019-10-09 20:28:35 UTC -+++ tools/flang2/flang2exe/CMakeLists.txt -@@ -98,7 +98,7 @@ set(INCLUDE_DIRS - ${FLANG_SOURCE_DIR}/lib/scutil - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -- ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET_ARCHITECTURE}-${TARGET_OS} -+ ${CMAKE_CURRENT_SOURCE_DIR}/${TARGET_ARCHITECTURE}-Linux - ${UTILS_SYMTAB_BIN_DIR} # Symbol table headers - ${UTILS_ILI_BIN_DIR} # ILI IR headers - ${UTILS_ILM_BIN_DIR} # ILM IR headers diff --git a/devel/flang/pkg-descr b/devel/flang/pkg-descr deleted file mode 100644 index 65197571bf5ca..0000000000000 --- a/devel/flang/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Fortran compiler targeting LLVM (modified clang part) diff --git a/devel/flang/pkg-plist b/devel/flang/pkg-plist deleted file mode 100644 index d1ad9346916e1..0000000000000 --- a/devel/flang/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -flang/bin/flang1 -flang/bin/flang2 -flang/include/__norm2.mod -flang/include/__norm2_i8.mod -flang/include/ieee_arithmetic.mod -flang/include/ieee_arithmetic_la.mod -flang/include/ieee_exceptions.mod -flang/include/ieee_exceptions_la.mod -flang/include/ieee_features.mod -flang/include/iso_c_binding.mod -flang/include/iso_fortran_env.mod -flang/include/omp_lib.h -flang/include/omp_lib.mod -flang/include/omp_lib_kinds.mod -flang/lib/libflang.a -flang/lib/libflang.so -flang/lib/libflangADT.a -flang/lib/libflangArgParser.a -flang/lib/libflangmain.a -flang/lib/libflangrti.a -flang/lib/libflangrti.so -flang/lib/libompstub.a -flang/lib/libompstub.so