pool/swipl
SHA256
2
0
Fork 3
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: failing jpl:prolog_in_java (gh#SWI-Prolog/packages-jpl#104)

Browse Source 
Patch from gh#SWI-Prolog/packages-jpl@e3be3065f2c8
This commit is contained in:
Matej Cepl 2024-11-22 18:28:37 +01:00
parent 5b42fda5cc
commit 2517a3204b
Signed by untrusted user: mcepl
GPG Key ID: 79205802880BC9D8
3 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
104-fix-prolog_in_java.patch Normal file
View File

@ -0,0 +1,46 @@
---
packages/jpl/cmake/JUnit.cmake | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
--- a/packages/jpl/cmake/JUnit.cmake
+++ b/packages/jpl/cmake/JUnit.cmake
@@ -16,17 +16,28 @@
# Unfortunately GLOB ? means exactly one, so cannot use it to make the - optional!
## GLOB EXPRESSION: https://facelessuser.github.io/wcmatch/glob/
if(NOT JUNIT_JAR)
- file(GLOB JUNIT_JAR
- ${JAVA_LIB_INSTALL_DIR}/junit4.jar
- ${JAVA_LIB_INSTALL_DIR}/junit-4*.jar
- /usr/share/java/junit4.jar
- /usr/share/java/junit-4*.jar
- /usr/share/java/junit.jar
- /opt/local/share/java/junit.jar # Macport
- /opt/local/share/java/junit4.jar
- /opt/local/share/java/junit-4*.jar
- /usr/local/share/java/junit4.jar
- /usr/local/share/java/junit-4*.jar)
+ file(GLOB F_JUNIT_JAR
+ ${JAVA_LIB_INSTALL_DIR}/junit4.jar
+ ${JAVA_LIB_INSTALL_DIR}/junit-4*.jar
+ /usr/share/java/junit4.jar
+ /usr/share/java/junit-4*.jar
+ /opt/local/share/java/junit4.jar
+ /opt/local/share/java/junit-4*.jar
+ /usr/local/share/java/junit4.jar
+ /usr/local/share/java/junit-4*.jar)
+ if(NOT F_JUNIT_JAR)
+ file(GLOB F_JUNIT_JAR
+ /usr/share/java/junit.jar
+ /opt/local/share/java/junit.jar)
+ endif()
+ if(F_JUNIT_JAR)
+ list(GET F_JUNIT_JAR 0 F_JUNIT_JAR)
+ message("Found junit at ${F_JUNIT_JAR}")
+ else()
+ message("Could not find junit.jar.")
+ endif()
+ set(JUNIT_JAR ${F_JUNIT_JAR} CACHE FILEPATH
+ "junit4 jar file")
endif()
MARK_AS_ADVANCED(JUNIT_JAR)
find_file(HAMCREST

1
swipl.changes
View File

@ -6,6 +6,7 @@ Fri Nov 22 13:31:23 UTC 2024 - Matej Cepl <mcepl@cepl.eu>
https://www.swi-prolog.org/ChangeLog?branch=development&from=9.3.12&to=9.3.15
and upstream still doesn’t provide any abbreviated version, and
the list of changes is still too long to enumerate here.
- Add 104-fix-prolog_in_java.patch to fix failing test jpl:prolog_in_java
-------------------------------------------------------------------
Wed Oct 9 13:15:26 UTC 2024 - Matej Cepl <mcepl@cepl.eu>

5
swipl.spec
View File

@ -26,6 +26,9 @@ Source0: https://www.swi-prolog.org/download/devel/src/swipl-%{version}.t
Source98: swipl-rpmlintrc
# For SOURCE_DATE_EPOCH variable- reproducible builds
Source99: %{name}.changes
# PATCH-FIX-UPSTREAM 104-fix-prolog_in_java.patch gh#SWI-Prolog/packages-jpl#104 mcepl@suse.com
# Fix the wrong location of hamcrest location
Patch0: 104-fix-prolog_in_java.patch
BuildRequires: cmake
BuildRequires: db-devel
BuildRequires: fdupes
@ -114,8 +117,6 @@ CTEST_OPT_ARGS=""
%ifarch %ix86
CTEST_OPT_ARGS+=" --exclude-regex 'swipl:transaction'"
%endif
# gh#SWI-Prolog/swipl-devel#1333
CTEST_OPT_ARGS+=" --exclude-regex 'jpl:prolog_in_java'"
%ctest --verbose $CTEST_OPT_ARGS
%files