| Message ID | 20240706142050.3693937-1-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On Sat, 6 Jul 2024 16:20:50 +0200 Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote: > Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum > fuzz factor to 0") reduced the fuzz factor. > > Due to this change, yajl fails to build with output: > > Applying 0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch using patch: > patching file src/CMakeLists.txt > Hunk #1 FAILED at 37. > Hunk #2 succeeded at 52 (offset 1 line). > Hunk #3 succeeded at 79 (offset 1 line). > 1 out of 3 hunks FAILED -- saving rejects to file src/CMakeLists.txt.rej > > This commit refreshes the package patch on the current package version. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > ...isable-shared-library-build-when-BUILD_SHARED.patch | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) Applied to master, thanks. Thomas
diff --git a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch index 53decca64989..e9170772d43d 100644 --- a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +++ b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch @@ -7,6 +7,8 @@ When BUILD_SHARED_LIBS is off, you don't want to build the shared library. Signed-off-by: Samuel Martin <s.martin49@gmail.com> +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- src/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) @@ -15,15 +17,15 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 99cf9e9..9e9c77d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -37,6 +37,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir}) - +@@ -38,6 +38,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir}) ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) + SET_TARGET_PROPERTIES(yajl_s PROPERTIES OUTPUT_NAME yajl) +IF(BUILD_SHARED_LIBS) ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) #### setup shared library version number -@@ -51,6 +52,7 @@ IF(APPLE) +@@ -52,6 +53,7 @@ IF(APPLE) SET_TARGET_PROPERTIES(yajl PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") ENDIF(APPLE) @@ -31,7 +33,7 @@ index 99cf9e9..9e9c77d 100644 #### build up an sdk as a post build step -@@ -77,10 +79,12 @@ INCLUDE_DIRECTORIES(${incDir}/..) +@@ -78,10 +80,12 @@ INCLUDE_DIRECTORIES(${incDir}/..) # at build time you may specify the cmake variable LIB_SUFFIX to handle # 64-bit systems which use 'lib64'
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, yajl fails to build with output: Applying 0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch using patch: patching file src/CMakeLists.txt Hunk #1 FAILED at 37. Hunk #2 succeeded at 52 (offset 1 line). Hunk #3 succeeded at 79 (offset 1 line). 1 out of 3 hunks FAILED -- saving rejects to file src/CMakeLists.txt.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- ...isable-shared-library-build-when-BUILD_SHARED.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)