Skip to content

Commit 9d88839

Browse files
passgattpetazzoni
authored andcommitted
package/yajl: update the patches to be applied with fuzz 0
Commit 8f88a64 ("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>
1 parent 2898d7b commit 9d88839

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ When BUILD_SHARED_LIBS is off, you don't want to build the shared
77
library.
88

99
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
10+
[Dario: make the patch to be applied with fuzz factor 0]
11+
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
1012
---
1113
src/CMakeLists.txt | 4 ++++
1214
1 file changed, 4 insertions(+)
@@ -15,23 +17,23 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
1517
index 99cf9e9..9e9c77d 100644
1618
--- a/src/CMakeLists.txt
1719
+++ b/src/CMakeLists.txt
18-
@@ -37,6 +37,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir})
19-
20+
@@ -38,6 +38,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir})
2021
ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS})
22+
SET_TARGET_PROPERTIES(yajl_s PROPERTIES OUTPUT_NAME yajl)
2123

2224
+IF(BUILD_SHARED_LIBS)
2325
ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS})
2426

2527
#### setup shared library version number
26-
@@ -51,6 +52,7 @@ IF(APPLE)
28+
@@ -52,6 +53,7 @@ IF(APPLE)
2729
SET_TARGET_PROPERTIES(yajl PROPERTIES
2830
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
2931
ENDIF(APPLE)
3032
+ENDIF(BUILD_SHARED_LIBS)
3133

3234
#### build up an sdk as a post build step
3335

34-
@@ -77,10 +79,12 @@ INCLUDE_DIRECTORIES(${incDir}/..)
36+
@@ -78,10 +80,12 @@ INCLUDE_DIRECTORIES(${incDir}/..)
3537

3638
# at build time you may specify the cmake variable LIB_SUFFIX to handle
3739
# 64-bit systems which use 'lib64'

0 commit comments

Comments
 (0)