mirror of
https://github.com/weechat/weechat.git
synced 2026-06-24 20:06:38 +02:00
core: disable CJSON in Debian/buster, Raspbian/buster and Ubuntu/focal builds (issue #2066)
This is because in these versions the libcjson-dev package doesn't provide pkg-config file.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git a/debian-devel/control b/debian-devel/control
|
||||
index 1abbda247..0db73f390 100644
|
||||
index a5d24b6a8..edae1ec5e 100644
|
||||
--- a/debian-devel/control
|
||||
+++ b/debian-devel/control
|
||||
@@ -14,7 +14,7 @@ Build-Depends:
|
||||
@@ -11,8 +11,20 @@ index 1abbda247..0db73f390 100644
|
||||
php-dev, libphp-embed, libargon2-dev, libsodium-dev,
|
||||
libxml2-dev,
|
||||
libcurl4-gnutls-dev,
|
||||
diff --git a/debian-devel/rules b/debian-devel/rules
|
||||
index cab713c93..d2756333b 100755
|
||||
--- a/debian-devel/rules
|
||||
+++ b/debian-devel/rules
|
||||
@@ -8,6 +8,7 @@ override_dh_auto_configure:
|
||||
dh_auto_configure --buildsystem=cmake -- \
|
||||
-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
|
||||
-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
|
||||
+ -DENABLE_CJSON:BOOL=OFF \
|
||||
-DENABLE_DOC:BOOL=ON \
|
||||
-DENABLE_MAN:BOOL=ON \
|
||||
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
|
||||
diff --git a/debian-stable/control b/debian-stable/control
|
||||
index 428f11ce9..dcf71da3e 100644
|
||||
index a75e6fee5..50c4f69a8 100644
|
||||
--- a/debian-stable/control
|
||||
+++ b/debian-stable/control
|
||||
@@ -14,7 +14,7 @@ Build-Depends:
|
||||
@@ -24,3 +36,15 @@ index 428f11ce9..dcf71da3e 100644
|
||||
php-dev, libphp-embed, libargon2-dev, libsodium-dev,
|
||||
libxml2-dev,
|
||||
libcurl4-gnutls-dev,
|
||||
diff --git a/debian-stable/rules b/debian-stable/rules
|
||||
index cab713c93..d2756333b 100755
|
||||
--- a/debian-stable/rules
|
||||
+++ b/debian-stable/rules
|
||||
@@ -8,6 +8,7 @@ override_dh_auto_configure:
|
||||
dh_auto_configure --buildsystem=cmake -- \
|
||||
-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
|
||||
-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
|
||||
+ -DENABLE_CJSON:BOOL=OFF \
|
||||
-DENABLE_DOC:BOOL=ON \
|
||||
-DENABLE_MAN:BOOL=ON \
|
||||
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
diff --git a/debian-devel/rules b/debian-devel/rules
|
||||
index cab713c93..d2756333b 100755
|
||||
--- a/debian-devel/rules
|
||||
+++ b/debian-devel/rules
|
||||
@@ -8,6 +8,7 @@ override_dh_auto_configure:
|
||||
dh_auto_configure --buildsystem=cmake -- \
|
||||
-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
|
||||
-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
|
||||
+ -DENABLE_CJSON:BOOL=OFF \
|
||||
-DENABLE_DOC:BOOL=ON \
|
||||
-DENABLE_MAN:BOOL=ON \
|
||||
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
|
||||
diff --git a/debian-stable/rules b/debian-stable/rules
|
||||
index cab713c93..d2756333b 100755
|
||||
--- a/debian-stable/rules
|
||||
+++ b/debian-stable/rules
|
||||
@@ -8,6 +8,7 @@ override_dh_auto_configure:
|
||||
dh_auto_configure --buildsystem=cmake -- \
|
||||
-DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
|
||||
-DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
|
||||
+ -DENABLE_CJSON:BOOL=OFF \
|
||||
-DENABLE_DOC:BOOL=ON \
|
||||
-DENABLE_MAN:BOOL=ON \
|
||||
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
|
||||
Reference in New Issue
Block a user