[med-svn] [Git][med-team/sra-sdk][master] 2 commits: Build-Depends: default-jdk instead of default-jdk-headless

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / sra-sdk


Commits:
281c0e4b by Andreas Tille at 2022-07-29T12:24:23+02:00
Build-Depends: default-jdk instead of default-jdk-headless

- - - - -
2c722cc6 by Andreas Tille at 2022-07-29T12:32:30+02:00
Try enhancing re2 patch but its not doing the full trick

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/use_debian_packaged_re2.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -2,7 +2,7 @@ sra-sdk (3.0.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream version
   * Standards-Version: 4.6.1 (routine-update)
-  * Build-Depends: default-jdk-headless, flex, bison
+  * Build-Depends: default-jdk, flex, bison
 
  -- Andreas Tille <tille at debian.org>  Wed, 27 Jul 2022 13:36:32 +0200
 


=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 13),
                libxml2-dev,
                libzstd-dev,
                python3,
-               default-jdk-headless,
+               default-jdk,
                flex,
                bison
 Standards-Version: 4.6.1


=====================================
debian/patches/use_debian_packaged_re2.patch
=====================================
@@ -65,3 +65,40 @@
 -endif()
 \ No newline at end of file
 +endif()
+--- a/test/sharq/CMakeLists.txt
++++ b/test/sharq/CMakeLists.txt
+@@ -37,26 +37,7 @@ if ( ZLIB_FOUND AND BZip2_FOUND AND Thre
+     set(LOCAL_INCDIR ${LOCAL_BUILD_DIR}/include)
+     set(LOCAL_LIBDIR ${LOCAL_BUILD_DIR}/lib)
+ 
+-    # Google RE2 release
+-    set(RE2_TAG 2021-09-01)
+-
+-    include (ExternalProject)
+-    ExternalProject_Add(RE2_
+-    PREFIX RE2
+-    GIT_REPOSITORY https://github.com/google/re2.git
+-    GIT_TAG ${RE2_TAG}
+-    BUILD_IN_SOURCE 1
+-    UPDATE_COMMAND "" # No update as we use specific tag
+-    CMAKE_ARGS
+-        -DCMAKE_BUILD_TYPE:STRING=Release
+-        -DRE2_BUILD_TESTING:BOOL=OFF
+-        -DCMAKE_INSTALL_PREFIX:PATH=${LOCAL_BUILD_DIR}
+-        -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+-        -DCMAKE_INSTALL_LIBDIR:PATH=lib
+-        -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
+-        -DCMAKE_INSTALL_MESSAGE:STRING=LAZY
+-    )
+-    set(RE2_STATIC_LIBRARIES -L${LOCAL_LIBDIR} -lre2 )
++    set(RE2_STATIC_LIBRARIES -lre2 )
+     add_executable(test-sharq-parser test-sharq-parser.cpp )
+     add_dependencies(test-sharq-parser RE2_)
+     target_include_directories(test-sharq-parser PUBLIC ${LOCAL_INCDIR} ../../tools/sharq)
+@@ -131,4 +112,4 @@ if ( ZLIB_FOUND AND BZip2_FOUND AND Thre
+ 
+ endif()
+ 
+-endif()
+\ No newline at end of file
++endif()



View it on GitLab: https://salsa.debian.org/med-team/sra-sdk/-/compare/da65c1cec5f3e8ccb26cbc57d1c4b8e3b33d7647...2c722cc63d7b99195c4727c8e613461bb7ec7340

-- 
View it on GitLab: https://salsa.debian.org/med-team/sra-sdk/-/compare/da65c1cec5f3e8ccb26cbc57d1c4b8e3b33d7647...2c722cc63d7b99195c4727c8e613461bb7ec7340
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220729/9ab659b0/attachment-0001.htm>