Fix build with legacy swig and add libc dependency (#206)

Signed-off-by: Raul Metsma <raul@metsma.ee>
open-eid · May 28, 2018 · be379b8 · be379b8
1 parent 68adb56
commit be379b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/debian/control b/debian/control
@@ -65,7 +65,8 @@ Architecture: any
 Section: libdevel
 Depends:
  libdigidocpp1 (= ${binary:Version}),
- ${misc:Depends}
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: DigiDoc digital signature library development files
  This package contains files necessary for developing applications with the
  DigiDoc digital signature library.

diff --git a/debian/libdigidocpp-dev.lintian-overrides b/debian/libdigidocpp-dev.lintian-overrides
@@ -0,0 +1 @@
+libdigidocpp-dev: sharedobject-in-library-directory-missing-soname
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -287,7 +287,7 @@ if(SWIG_FOUND)
     if(JAVA_INCLUDE_PATH)
         set(CMAKE_SWIG_FLAGS -package ee.ria.libdigidocpp)
         set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/java)
-        swig_add_library(digidoc_java TYPE SHARED LANGUAGE java SOURCES ../libdigidocpp.i)
+        swig_add_module(digidoc_java java ../libdigidocpp.i)
         swig_link_libraries(digidoc_java digidocpp)
         set_target_properties(digidoc_java PROPERTIES DEBUG_OUTPUT_NAME "digidoc_javad")
         target_include_directories(digidoc_java PRIVATE ${JAVA_INCLUDE_PATH})
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		libdigidocpp-dev: sharedobject-in-library-directory-missing-soname