mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/yajl: update the patches to be applied with fuzz 0

Browse Source 
Commit 8f88a644ed ("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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Dario Binacchi
2024-07-06 16:20:50 +02:00
committed by Thomas Petazzoni
parent 2898d7bef6
commit 9d8883971d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch
View File

@@ -7,6 +7,8 @@ When BUILD_SHARED_LIBS is off, you don't want to build the shared
library. library.
Signed-off-by: Samuel Martin <s.martin49@gmail.com> 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 ++++ src/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
@@ -15,15 +17,15 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 99cf9e9..9e9c77d 100644 index 99cf9e9..9e9c77d 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/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}) ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS})
SET_TARGET_PROPERTIES(yajl_s PROPERTIES OUTPUT_NAME yajl)
+IF(BUILD_SHARED_LIBS) +IF(BUILD_SHARED_LIBS)
ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS})
#### setup shared library version number #### setup shared library version number
@@ -51,6 +52,7 @@ IF(APPLE) @@ -52,6 +53,7 @@ IF(APPLE)
SET_TARGET_PROPERTIES(yajl PROPERTIES SET_TARGET_PROPERTIES(yajl PROPERTIES
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
ENDIF(APPLE) ENDIF(APPLE)
@@ -31,7 +33,7 @@ index 99cf9e9..9e9c77d 100644
#### build up an sdk as a post build step #### 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 # at build time you may specify the cmake variable LIB_SUFFIX to handle
# 64-bit systems which use 'lib64' # 64-bit systems which use 'lib64'