Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hashlink for openSUSE:Factory
checked in at 2022-05-21 19:06:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hashlink (Old)
and /work/SRC/openSUSE:Factory/.hashlink.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hashlink"
Sat May 21 19:06:40 2022 rev:3 rq:978418 version:1.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/hashlink/hashlink.changes 2022-05-10
15:12:13.163591897 +0200
+++ /work/SRC/openSUSE:Factory/.hashlink.new.1538/hashlink.changes
2022-05-21 19:07:46.667437655 +0200
@@ -1,0 +2,7 @@
+Sat May 21 11:58:17 UTC 2022 - Jaime Marqu??nez Ferr??ndiz
<jaime.marquinez.ferran...@fastmail.net>
+
+- Add 0001-cmake-Don-t-build-the-interpreter-on-ARM.patch and
+ 0001-cmake-Don-t-run-the-version-test-if-the-interpreter-.patch : disable the
+ interpreter on ARM architectures
+
+-------------------------------------------------------------------
New:
----
0001-cmake-Don-t-build-the-interpreter-on-ARM.patch
0001-cmake-Don-t-run-the-version-test-if-the-interpreter-.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hashlink.spec ++++++
--- /var/tmp/diff_new_pack.3nkd20/_old 2022-05-21 19:07:47.175438403 +0200
+++ /var/tmp/diff_new_pack.3nkd20/_new 2022-05-21 19:07:47.179438409 +0200
@@ -29,6 +29,10 @@
Patch02: 0001-cmake-Install-hlc_main.c-with-hl.h-and-hlc.h.patch
# PATCH-FIX-UPSTREAM
Patch03: 0001-Disable-the-JIT-tests-on-arm-architectures.patch
+# PATCH-FIX-UPSTREAM
+Patch04: 0001-cmake-Don-t-build-the-interpreter-on-ARM.patch
+# PATCH-FIX-UPSTREAM
+Patch05: 0001-cmake-Don-t-run-the-version-test-if-the-interpreter-.patch
BuildRequires: cmake
BuildRequires: haxe >= 4.0
BuildRequires: mbedtls-devel
@@ -92,7 +96,9 @@
%postun -n libhl1 -p /sbin/ldconfig
%files
+%ifnarch %{arm} %{arm64}
%{_bindir}/hl
+%endif
%license LICENSE
%doc README.md
++++++ 0001-cmake-Don-t-build-the-interpreter-on-ARM.patch ++++++
>From 5f294de79b17e9131f9c5fac583ba6c0273f072c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
<jaime.marquinez.ferran...@fastmail.net>
Date: Fri, 20 May 2022 18:28:05 +0200
Subject: [PATCH] cmake: Don't build the interpreter on ARM
Upstream: submitted
References: gh#HaxeFoundation/hashlink#521
---
CMakeLists.txt | 51 ++++++++++++++++++++++++++++++--------------------
1 file changed, 31 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4dbce78..e073af1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,11 @@ else()
set(CMAKE_C_STANDARD_REQUIRED ON)
endif()
+set(INTERPRETER_ENABLED TRUE)
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64")
+ set(INTERPRETER_ENABLED FALSE)
+endif()
+
# put output in "bin"
set(OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin)
@@ -136,24 +141,29 @@ set_target_properties(libhl
COMPILE_DEFINITIONS "_USRDLL;LIBHL_EXPORTS"
)
-add_executable(hl
- src/code.c
- src/jit.c
- src/main.c
- src/module.c
- src/debugger.c
- src/profile.c
-)
+if(INTERPRETER_ENABLED)
+ add_executable(hl
+ src/code.c
+ src/jit.c
+ src/main.c
+ src/module.c
+ src/debugger.c
+ src/profile.c
+ )
-if (UNIX AND NOT APPLE)
- set_target_properties(hl PROPERTIES INSTALL_RPATH
"$ORIGIN;${CMAKE_INSTALL_PREFIX}/lib")
+ if (UNIX AND NOT APPLE)
+ set_target_properties(hl PROPERTIES INSTALL_RPATH
"$ORIGIN;${CMAKE_INSTALL_PREFIX}/lib")
+ endif()
+
+ target_link_libraries(hl libhl)
endif()
-target_link_libraries(hl libhl)
if(WIN32)
target_link_libraries(libhl ws2_32 user32)
- target_link_libraries(hl user32)
+ if(INTERPRETER_ENABLED)
+ target_link_libraries(hl user32)
+ endif()
else()
target_link_libraries(libhl m dl pthread)
endif()
@@ -271,12 +281,8 @@ if(BUILD_TESTING)
#####################
# Tests
- set(JIT_TEST_ENABLED TRUE)
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64")
- set(JIT_TEST_ENABLED FALSE)
- endif()
- if(JIT_TEST_ENABLED)
+ if(INTERPRETER_ENABLED)
add_test(NAME hello.hl
COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
)
@@ -329,10 +335,15 @@ set(HDLL_DESTINATION
${CMAKE_INSTALL_LIBDIR}
)
+
+if(INTERPRETER_ENABLED)
+ set(INSTALL_TARGETS hl libhl)
+else()
+ set(INSTALL_TARGETS libhl)
+endif()
+
install(
- TARGETS
- hl
- libhl
+ TARGETS ${INSTALL_TARGETS}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
--
2.36.1
++++++ 0001-cmake-Don-t-run-the-version-test-if-the-interpreter-.patch ++++++
>From 0bcdfac6782485dd8b3ba218e9f5b0e3b1bfe58f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
<jaime.marquinez.ferran...@fastmail.net>
Date: Sat, 21 May 2022 13:55:11 +0200
Subject: [PATCH] cmake: Don't run the version test if the interpreter is not
enabled
Upstream: submitted
References: gh#HaxeFoundation/hashlink#521
---
CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e073af1..77c7c46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -292,6 +292,13 @@ if(BUILD_TESTING)
add_test(NAME uvsample.hl
COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
)
+ add_test(NAME version
+ COMMAND hl --version
+ )
+ set_tests_properties(version
+ PROPERTIES
+ PASS_REGULAR_EXPRESSION "${HL_VERSION}"
+ )
endif()
add_test(NAME hello
COMMAND hello
@@ -302,13 +309,6 @@ if(BUILD_TESTING)
add_test(NAME uvsample
COMMAND uvsample
)
- add_test(NAME version
- COMMAND hl --version
- )
- set_tests_properties(version
- PROPERTIES
- PASS_REGULAR_EXPRESSION "${HL_VERSION}"
- )
endif()
--
2.36.1
