[ampl-asl] Update to 20240201 and fix cross compiling

microsoft · Sep 14, 2024 · 6aae384 · 6aae384
1 parent 86fba13
commit 6aae384
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 141 deletions.
diff --git a/ports/ampl-asl/0006-disable-generate-arith-h.diff b/ports/ampl-asl/0006-disable-generate-arith-h.diff
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1d4b65e..21b32ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -104,7 +104,7 @@ file(WRITE ${GENERATED_INCLUDE_DIR}/details.c "${DETAILS}")
+ configure_file(${SRCDIR}/solvers/stdio1.h0 ${GENERATED_INCLUDE_DIR}/stdio1.h
+                COPYONLY)
+
+-if(CMAKE_CROSSCOMPILING AND CMAKE_SYSTEM_PROCESSOR MATCHES "^x86")
++if(0)
+   include(CheckTypeSize)
+   check_type_size(double DOUBLE_SIZE)
+   check_type_size(long LONG_SIZE)
diff --git a/ports/ampl-asl/copyright b/ports/ampl-asl/copyright
diff --git a/ports/ampl-asl/fix-crt-linkage.patch b/ports/ampl-asl/fix-crt-linkage.patch
diff --git a/ports/ampl-asl/install-extra-headers.patch b/ports/ampl-asl/install-extra-headers.patch
diff --git a/ports/ampl-asl/install-targets.patch b/ports/ampl-asl/install-targets.patch
diff --git a/ports/ampl-asl/portfile.cmake b/ports/ampl-asl/portfile.cmake
@@ -3,14 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ampl/asl
-    REF 934d34719c8a620fcf16ae5a3c00c326eb22e748
-    SHA512 b6fcb3dcb53a53d975666db1643d7ea518246e8fb6745621ce4b63de4393f7767844e9241baa6fdf1a45c241a9aa0866844c47deec0020313278128cccff6869
+    REF 2f5d9de248c53a3063bba23af2013cd3db768bf8
+    SHA512 a551420f60b2419285195063fc42b208e59f076d1d00e4b90847c15613997ba35d319d57275687df37e74a7486420fec2cde7da71a6126802ed19a12dcb8ffdc
     HEAD_REF master
     PATCHES
         workaround-msvc-optimizer-ice.patch
-        fix-crt-linkage.patch # CRT linkage uses C/CXX FLAGS in vcpkg
-        install-extra-headers.patch
-        install-targets.patch
+        0006-disable-generate-arith-h.diff
 )
 
 vcpkg_cmake_configure(
@@ -26,9 +24,8 @@ vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-asl)
+vcpkg_cmake_config_fixup()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-# from ampl-mp license
-file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/ampl-asl/vcpkg.json b/ports/ampl-asl/vcpkg.json
@@ -1,11 +1,9 @@
 {
   "name": "ampl-asl",
-  "version-date": "2020-11-11",
-  "port-version": 3,
+  "version-date": "2024-02-01",
   "description": "AMPL Solver Library",
   "homepage": "https://github.com/ampl/asl",
-  "license": null,
-  "supports": "!uwp & !(osx & arm64)",
+  "license": "BSD-3-Clause",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/ports/ampl-mp/fix-dependency-asl.patch b/ports/ampl-mp/fix-dependency-asl.patch
@@ -6,7 +6,7 @@ index 13f11cb..92089a3 100644
    endif()
  endif ()
 
-+find_package(unofficial-asl CONFIG REQUIRED)
++find_package(asl CONFIG REQUIRED)
  add_subdirectory(doc)
  add_subdirectory(src/amplsig)
 -add_subdirectory(src/asl)

diff --git a/ports/ampl-mp/vcpkg.json b/ports/ampl-mp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ampl-mp",
   "version-date": "2020-11-11",
-  "port-version": 4,
+  "port-version": 5,
   "description": "An open-source library for mathematical programming",
   "homepage": "https://github.com/ampl/mp",
   "supports": "!uwp",

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -48,7 +48,6 @@ ace:x64-android=fail
 allegro5:arm-neon-android=fail
 allegro5:arm64-android=fail
 allegro5:x64-android=fail
-ampl-asl:x64-android=fail
 apr:arm-neon-android=fail
 apr:arm64-android=fail
 apr:x64-android=fail

diff --git a/versions/a-/ampl-asl.json b/versions/a-/ampl-asl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "100bccb77a0d1826eb8213daf74e7771043c0e2a",
+      "version-date": "2024-02-01",
+      "port-version": 0
+    },
     {
       "git-tree": "2a88fb5c85a975bf5c5b49b6d87224b25504553d",
       "version-date": "2020-11-11",

diff --git a/versions/a-/ampl-mp.json b/versions/a-/ampl-mp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c0ef1a641525b5cd1268f5ebe3f53f083492e22e",
+      "version-date": "2020-11-11",
+      "port-version": 5
+    },
     {
       "git-tree": "adc07c10ee68ac3ebb3ea916bc4a62bf1ceaf5cc",
       "version-date": "2020-11-11",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -109,12 +109,12 @@
       "port-version": 1
     },
     "ampl-asl": {
-      "baseline": "2020-11-11",
-      "port-version": 3
+      "baseline": "2024-02-01",
+      "port-version": 0
     },
     "ampl-mp": {
       "baseline": "2020-11-11",
-      "port-version": 4
+      "port-version": 5
     },
     "amqpcpp": {
       "baseline": "4.3.26",