mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
iniparser: upgrade 4.2 -> 4.2.1
Hompage-Upgrade: upstream iniparser moved to Gitlab Add-CMake-support.patch removed since CMake support is now provided upstream 0001-iniparser.pc-Make-libpath-a-variable.patch removed since pkg-config file is now generated by CMake Signed-off-by: Lars Möllendorf <lars.moellendorf@plating.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Lars Möllendorf
committed by
Khem Raj
Khem Raj
parent
cda9ade9fb
commit
965b0192c5
-23
@@ -1,23 +0,0 @@
|
||||
From 1761298b73c759c07e4652ada307f68512a75ff1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 25 Mar 2022 20:44:41 -0700
|
||||
Subject: [PATCH] iniparser.pc: Make libpath a variable
|
||||
|
||||
Will set according to baselib that yocto exports.
|
||||
|
||||
Upstream-Status: Inappropriate [OE-specific]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
iniparser.pc | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/iniparser.pc
|
||||
+++ b/iniparser.pc
|
||||
@@ -1,6 +1,6 @@
|
||||
prefix=/usr
|
||||
exec_prefix=/usr
|
||||
-libdir=${exec_prefix}/lib
|
||||
+libdir=${exec_prefix}/@baselib@
|
||||
includedir=${prefix}/include
|
||||
datarootdir=${prefix}/share
|
||||
datadir=${datarootdir}
|
||||
@@ -1,65 +0,0 @@
|
||||
Origin: Debian packaging
|
||||
From: Klee Dienes <klee@mit.edu>
|
||||
Date: Thu, 13 Feb 2014 07:03:26 -0500
|
||||
Subject: Add CMake support.
|
||||
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
CMakeLists.txt | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 44 insertions(+)
|
||||
create mode 100644 CMakeLists.txt
|
||||
|
||||
--- /dev/null
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -0,0 +1,50 @@
|
||||
+cmake_minimum_required (VERSION 2.8.8)
|
||||
+
|
||||
+project (iniparser)
|
||||
+include (GNUInstallDirs)
|
||||
+
|
||||
+include_directories (src)
|
||||
+
|
||||
+set(INIPARSER_SRCS src/dictionary.c src/iniparser.c)
|
||||
+set(INIPARSER_HDRS src/dictionary.h src/iniparser.h)
|
||||
+
|
||||
+add_library(iniparser-shared SHARED ${INIPARSER_SRCS} ${INIPARSER_HDRS})
|
||||
+add_library(iniparser-static STATIC ${INIPARSER_SRCS} ${INIPARSER_HDRS})
|
||||
+
|
||||
+set_target_properties(iniparser-shared PROPERTIES SOVERSION 1)
|
||||
+set_target_properties(iniparser-shared PROPERTIES OUTPUT_NAME iniparser)
|
||||
+set_target_properties(iniparser-static PROPERTIES OUTPUT_NAME iniparser)
|
||||
+
|
||||
+install (TARGETS iniparser-shared
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+
|
||||
+install (TARGETS iniparser-static
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+
|
||||
+find_package(Doxygen)
|
||||
+if (NOT DOXYGEN_FOUND)
|
||||
+message(FATAL_ERROR "Doxygen is needed to build the documentation. Please install it correctly")
|
||||
+endif()
|
||||
+
|
||||
+file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox
|
||||
+ "@INCLUDE = ${CMAKE_CURRENT_SOURCE_DIR}/doc/iniparser.dox\n"
|
||||
+ "OUTPUT_DIRECTORY = ${CMAKE_CURRENT_BINARY_DIR}\n"
|
||||
+ )
|
||||
+
|
||||
+add_custom_target (doc ALL
|
||||
+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/iniparser.dox
|
||||
+ SOURCES doc/iniparser.dox)
|
||||
+
|
||||
+enable_testing()
|
||||
+
|
||||
+add_test(NAME testsuite
|
||||
+ COMMAND make
|
||||
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test)
|
||||
+
|
||||
+install (FILES ${INIPARSER_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/iniparser)
|
||||
+
|
||||
+install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
@@ -0,0 +1,16 @@
|
||||
SUMMARY = "The iniParser library is a simple C library offering INI file parsing services (both reading and writing)."
|
||||
SECTION = "libs"
|
||||
HOMEPAGE = "https://gitlab.com/iniparser/iniparser"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678"
|
||||
SRCBRANCH = "main"
|
||||
SRCREV = "v${PV}"
|
||||
|
||||
DEPENDS = "doxygen-native"
|
||||
|
||||
SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit cmake
|
||||
|
||||
FILES_${PN}-staticdev += "${libdir}/cmake/iniparser/iniparser-staticTargets*.cmake"
|
||||
@@ -1,27 +0,0 @@
|
||||
SUMMARY = "The iniParser library is a simple C library offering INI file parsing services (both reading and writing)."
|
||||
SECTION = "libs"
|
||||
HOMEPAGE = "https://github.com/ndevilla/iniparser"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678"
|
||||
|
||||
DEPENDS = "doxygen-native"
|
||||
|
||||
PV .= "+git"
|
||||
|
||||
SRC_URI = "git://github.com/ndevilla/iniparser.git;protocol=https;branch=master \
|
||||
file://0001-iniparser.pc-Make-libpath-a-variable.patch \
|
||||
file://Add-CMake-support.patch \
|
||||
"
|
||||
|
||||
SRCREV = "9f5a6da1c245b44f49a46212ec0d81ffb1f821aa"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit cmake
|
||||
|
||||
do_install:append() {
|
||||
install -Dm 0644 ${S}/iniparser.pc ${D}${libdir}/pkgconfig/iniparser.pc
|
||||
sed -i -e 's,@baselib@,${baselib},g' ${D}${libdir}/pkgconfig/iniparser.pc
|
||||
}
|
||||
|
||||
BBCLASSEXTEND += "native"
|
||||
Reference in New Issue
Block a user