Tuesday, December 11, 2018

UPDATE: jansson (2.12)

Hi,

The diff does the followings:

- update to jansson-2.12
- include a static library
- use configure && make, instead of cmake

My motivation was to include the static library, since I'd like to use
it within a statically linked CGI program.

I had tried to modify CMakeLists.txt to build both static and shared
library, but it was not easy for me. On the other hand, just doing
"configure && make" does it as the default. I choiced "configure"
rather than cmake. Is there any reason to keep using cmake?

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jansson/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 7 Sep 2018 11:10:30 -0000 1.12
+++ Makefile 11 Dec 2018 09:47:05 -0000
@@ -2,9 +2,9 @@

COMMENT = library for manipulating JSON data

-DISTNAME = jansson-2.11
+DISTNAME = jansson-2.12

-SHARED_LIBS = jansson 3.1
+SHARED_LIBS = jansson 3.2

CATEGORIES = devel

@@ -17,10 +17,6 @@ PERMIT_PACKAGE_CDROM = Yes

MASTER_SITES = http://www.digip.org/jansson/releases/

-MODULES = devel/cmake
-
-CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON \
- -DJANSSON_BUILD_DOCS=OFF \
- -DJANSSON_EXAMPLES=OFF
+CONFIGURE_STYLE = gnu

.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/jansson/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 7 Sep 2018 11:10:30 -0000 1.5
+++ distinfo 11 Dec 2018 09:47:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (jansson-2.11.tar.gz) = boX0Lavkmngx291tMNyoqWaVa1GppQ7VNLgq/D+lsvQ=
-SIZE (jansson-2.11.tar.gz) = 483686
+SHA256 (jansson-2.12.tar.gz) = X43sdlBI76xdkZre1RsmoyoFOX6iB6p2n/a1PHAn0sk=
+SIZE (jansson-2.12.tar.gz) = 489154
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 7 Sep 2018 11:10:30 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.5 2018/09/07 11:10:30 sthen Exp $
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -640,7 +640,7 @@ file(RELATIVE_PATH
- # so that the include dirs are given relative to where the
- # config file is located.
- set(JANSSON__INCLUDE_DIRS
-- "\${JANSSON_CMAKE_DIR}/${REL_INCLUDE_DIR}")
-+ "${CMAKE_INSTALL_PREFIX}/include")
- configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfig.cmake.in
- ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JanssonConfig.cmake
- @ONLY)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/jansson/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 20 Mar 2015 13:28:23 -0000 1.3
+++ pkg/PLIST 11 Dec 2018 09:47:05 -0000
@@ -1,11 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2015/03/20 13:28:23 kirby Exp $
include/jansson.h
include/jansson_config.h
-lib/cmake/
-lib/cmake/jansson/
-lib/cmake/jansson/JanssonConfig.cmake
-lib/cmake/jansson/JanssonConfigVersion.cmake
-lib/cmake/jansson/JanssonTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/jansson/JanssonTargets.cmake
+lib/libjansson.a
+lib/libjansson.la
@lib lib/libjansson.so.${LIBjansson_VERSION}
lib/pkgconfig/jansson.pc

No comments:

Post a Comment