Switch to autotools instead of cmake

cmake is big and so are its dependencies.  Also it's not the build
system advertized by upstream.  Help + ok sthen@, LGTM kirby@ (maintainer)
This commit is contained in:
jca 2021-07-11 22:52:40 +00:00
parent 4ac6957e69
commit f9a50158e6
3 changed files with 7 additions and 58 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.15 2020/10/30 17:17:00 juanfra Exp $
# $OpenBSD: Makefile,v 1.16 2021/07/11 22:52:40 jca Exp $
COMMENT = library for manipulating JSON data
DISTNAME = jansson-2.12
REVISION = 0
REVISION = 1
SHARED_LIBS = jansson 3.2
SHARED_LIBS = jansson 4.0
CATEGORIES = devel
@ -18,10 +18,6 @@ PERMIT_PACKAGE = Yes
MASTER_SITES = https://digip.org/jansson/releases/
MODULES = devel/cmake
CONFIGURE_ARGS += -DJANSSON_BUILD_SHARED_LIBS=ON \
-DJANSSON_BUILD_DOCS=OFF \
-DJANSSON_EXAMPLES=OFF
CONFIGURE_STYLE = gnu
.include <bsd.port.mk>

View File

@ -1,42 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.6 2018/12/12 15:09:14 sthen Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -358,19 +358,19 @@ if(JANSSON_BUILD_SHARED_LIBS)
${JANSSON_HDR_PRIVATE}
${JANSSON_HDR_PUBLIC}
src/jansson.def)
-
set_target_properties(jansson PROPERTIES
VERSION ${JANSSON_VERSION}
SOVERSION ${JANSSON_SOVERSION})
-else()
- add_library(jansson STATIC
- ${JANSSON_SRC}
- ${JANSSON_HDR_PRIVATE}
- ${JANSSON_HDR_PUBLIC})
- set_target_properties(jansson PROPERTIES
- POSITION_INDEPENDENT_CODE true)
endif()
+add_library(janssonstatic STATIC
+ ${JANSSON_SRC}
+ ${JANSSON_HDR_PRIVATE}
+ ${JANSSON_HDR_PUBLIC})
+set_target_properties(janssonstatic PROPERTIES
+ OUTPUT_NAME jansson
+ POSITION_INDEPENDENT_CODE true)
+
if (JANSSON_EXAMPLES)
add_executable(simple_parse "${CMAKE_CURRENT_SOURCE_DIR}/examples/simple_parse.c")
target_link_libraries(simple_parse jansson)
@@ -652,7 +652,7 @@ configure_package_config_file(
#
option(JANSSON_INSTALL "Generate installation target" ON)
if (JANSSON_INSTALL)
- install(TARGETS jansson
+ install(TARGETS jansson janssonstatic
EXPORT janssonTargets
LIBRARY DESTINATION "lib"
ARCHIVE DESTINATION "lib"

View File

@ -1,12 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2018/12/12 15:09:14 sthen Exp $
@comment $OpenBSD: PLIST,v 1.5 2021/07/11 22:52:40 jca 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
@static-lib lib/libjansson.a
lib/libjansson.la
@lib lib/libjansson.so.${LIBjansson_VERSION}
lib/pkgconfig/jansson.pc