Configuration - Remove jemalloc port files (#581)

Removed overrides for jemalloc, now use standard port

diff --git a/adm/vcpkg/ports/jemalloc/fix-configure-ac.patch b/adm/vcpkg/ports/jemalloc/fix-configure-ac.patch
deleted file mode 100644 (file)
index 7799dfb..0000000
--- a/adm/vcpkg/ports/jemalloc/fix-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index f6d25f334..3115504e2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1592,7 +1592,7 @@ fi
- [enable_uaf_detection="0"]
- )
- if test "x$enable_uaf_detection" = "x1" ; then
--  AC_DEFINE([JEMALLOC_UAF_DETECTION], [ ])
-+  AC_DEFINE([JEMALLOC_UAF_DETECTION], [ ], ["enable UAF"])
- fi
- AC_SUBST([enable_uaf_detection])
- 

diff --git a/adm/vcpkg/ports/jemalloc/portfile.cmake b/adm/vcpkg/ports/jemalloc/portfile.cmake
deleted file mode 100644 (file)
index 2a4f4a4..0000000
--- a/adm/vcpkg/ports/jemalloc/portfile.cmake
+++ /dev/null
@@ -1,58 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO jemalloc/jemalloc
-    REF 54eaed1d8b56b1aa528be3bdd1877e59c56fa90c
-    SHA512 527bfbf5db9a5c2b7b04df4785b6ae9d445cff8cb17298bf3e550c88890d2bd7953642d8efaa417580610508279b527d3a3b9e227d17394fd2013c88cb7ae75a
-    HEAD_REF master
-    PATCHES
-        fix-configure-ac.patch
-        preprocessor.patch
-)
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(opts "ac_cv_search_log=none required" "--without-private-namespace")
-endif()
-
-set (opts "${opts}" "--disable-initial-exec-tls")
-
-vcpkg_configure_make(
-    SOURCE_PATH "${SOURCE_PATH}"
-    AUTOCONFIG
-    NO_WRAPPERS
-    OPTIONS ${opts}
-)
-
-vcpkg_install_make()
-
-if(VCPKG_TARGET_IS_WINDOWS)
-    file(COPY "${SOURCE_PATH}/include/msvc_compat/strings.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/jemalloc/msvc_compat")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/jemalloc/jemalloc.h" "<strings.h>" "\"msvc_compat/strings.h\"")
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-        file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/jemalloc.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
-        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jemalloc.dll" "${CURRENT_PACKAGES_DIR}/bin/jemalloc.dll")
-    endif()
-    if(NOT VCPKG_BUILD_TYPE)
-        if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-            file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/jemalloc.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
-            file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
-            file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jemalloc.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/jemalloc.dll")
-        endif()
-    endif()
-    if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/jemalloc.pc" "install_suffix=" "install_suffix=_s")
-        if(NOT VCPKG_BUILD_TYPE)
-            vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/jemalloc.pc" "install_suffix=" "install_suffix=_s")
-        endif()
-    endif()
-endif()
-
-vcpkg_fixup_pkgconfig()
-
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools")
-
-# Handle copyright
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

diff --git a/adm/vcpkg/ports/jemalloc/preprocessor.patch b/adm/vcpkg/ports/jemalloc/preprocessor.patch
deleted file mode 100644 (file)
index 6e6e2d1..0000000
--- a/adm/vcpkg/ports/jemalloc/preprocessor.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 3115504e2..ffb504b08 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -749,6 +749,7 @@ case "${host}" in
-       so="dll"
-       if test "x$je_cv_msvc" = "xyes" ; then
-         importlib="lib"
-+        JE_APPEND_VS(CPPFLAGS, -DJEMALLOC_NO_PRIVATE_NAMESPACE)
-         DSO_LDFLAGS="-LD"
-         EXTRA_LDFLAGS="-link -DEBUG"
-         CTARGET='-Fo$@'

diff --git a/adm/vcpkg/ports/jemalloc/vcpkg.json b/adm/vcpkg/ports/jemalloc/vcpkg.json
deleted file mode 100644 (file)
index 007e05b..0000000
--- a/adm/vcpkg/ports/jemalloc/vcpkg.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "jemalloc",
-  "version": "5.3.0",
-  "port-version": 1,
-  "description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support",
-  "homepage": "https://jemalloc.net/",
-  "license": "BSD-2-Clause"
-}