Skip to contentSkip to conversation

luajit: Add ppc/ppc64 to unsupported arch list

PATCH New Khem Raj 1 participant 8 messages Dec 19, 2019

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/8 luajit: Add ppc/ppc64 to unsupported arch list

---
 meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-devtools/luajit/luajit_2.0.5.bb +3 -1
index c2d2180bae..08a0470b04 100644
@@ -90,7 +90,9 @@ FILES_${PN}-dev += "${libdir}/libluajit-5.1.a \
 "
 FILES_luajit-common = "${datadir}/${BPN}-${PV}"
 
-# Aarch64/mips64 is not supported in this release
+# Aarch64/mips64/ppc/ppc64 is not supported in this release
 COMPATIBLE_HOST_aarch64 = "null"
 COMPATIBLE_HOST_mipsarchn32 = "null"
 COMPATIBLE_HOST_mipsarchn64 = "null"
+COMPATIBLE_HOST_powerpc = "null"
+COMPATIBLE_HOST_powerpc64 = "null"
Signature · 1 line
2.24.1
author
#1 lore raw

PATCH 2/8 rsyslog: Do not assume atomic built-ins on ppc

Fixes build issue
runtime/../action.c:2019: undefined reference to `__sync_val_compare_and_swap_8'

---
 meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-extended/rsyslog/rsyslog_8.1910.0.bb +1 -0
index 89ccc6d751..e8afae4ef2 100644
@@ -40,6 +40,7 @@ inherit autotools pkgconfig systemd update-rc.d ptest
 EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes"
 EXTRA_OECONF += "--enable-imfile-tests"
 EXTRA_OECONF_remove_mipsarch = "ap_cv_atomic_builtins=yes"
+EXTRA_OECONF_remove_powerpc = "ap_cv_atomic_builtins=yes"
 
 # first line is default yes in configure
 PACKAGECONFIG ??= " \
Signature · 1 line
2.24.1
author
#2 lore raw

PATCH 3/8 hiredis: Upgrade to 0.14.0

In reply to Khem Raj

* Define LIBRARY_PATH so multilibbed version can install correctly
* Forward port patches

---
 .../0001-Makefile-remove-hardcoding-of-CC.patch  | 16 ++++++----------
 .../{hiredis_0.13.1.bb => hiredis_0.14.0.bb}     |  5 +++--
 2 files changed, 9 insertions(+), 12 deletions(-)
 rename meta-oe/recipes-extended/hiredis/{hiredis_0.13.1.bb => hiredis_0.14.0.bb} (77%)
meta-oe/recipes-extended/hiredis/files/0001-Makefile-remove-hardcoding-of-CC.patch +6 -10
index fef2bc7541..1af5d26ac0 100644
@@ -11,22 +11,18 @@ Signed-off-by: Andrea Galbusera <[email protected]>
  Makefile | 5 -----
  1 file changed, 5 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 8b0f0c2..66a4317 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -34,11 +34,6 @@ define REDIS_TEST_CONFIG
+@@ -35,12 +35,6 @@ define REDIS_TEST_CONFIG
  endef
  export REDIS_TEST_CONFIG
  
 -# Fallback to gcc when $CC is not in $PATH.
--CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+-CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+-CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
 -OPTIMIZATION?=-O3
 -WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
--DEBUG?= -g -ggdb
- REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
- REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
+-DEBUG_FLAGS?= -g -ggdb
+ REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+ REAL_LDFLAGS=$(LDFLAGS)
  
--- 
-1.9.1
-
meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb renamed from meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb +3 -2
similarity index 77%
rename from meta-oe/recipes-extended/hiredis/hiredis_0.13.1.bb
rename to meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb
index fae30d771d..29f8de8d2f 100644
@@ -5,14 +5,15 @@ SECTION = "libs"
 DEPENDS = "redis"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51"
-SRC_URI = "git://github.com/redis/hiredis;protocol=git;rev=f58dd249d6ed47a7e835463c3b04722972281dbb \
+SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870"
+SRC_URI = "git://github.com/redis/hiredis;protocol=git \
            file://0001-Makefile-remove-hardcoding-of-CC.patch"
 
 S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig
 
-EXTRA_OEMAKE = "PREFIX=${prefix}"
+EXTRA_OEMAKE = "PREFIX=${prefix} LIBRARY_PATH=${baselib}"
 
 # By default INSTALL variable in Makefile is equal to 'cp -a', which preserves
 # ownership and causes host-user-contamination QA issue.
Signature · 1 line
2.24.1
author
#3 lore raw

PATCH 4/8 libfann: Define LIB_SUFFIX suitable for OE multilib needs

In reply to Khem Raj
---
 meta-oe/recipes-support/libfann/libfann_git.bb | 2 ++
 1 file changed, 2 insertions(+)
meta-oe/recipes-support/libfann/libfann_git.bb +2 -0
index c986e17757..eae24461dc 100644
@@ -15,3 +15,5 @@ SRC_URI = "git://github.com/libfann/fann.git;branch=master \
 PV = "2.2.0+git${SRCPV}"
 
 S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
Signature · 1 line
2.24.1
author
#4 lore raw

PATCH 5/8 libgit2: Upgrade to 0.28.4

In reply to Khem Raj

Fix library install path to consider multilib as well

---
 .../libgit2/{libgit2_0.28.3.bb => libgit2_0.28.4.bb}           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/libgit2/{libgit2_0.28.3.bb => libgit2_0.28.4.bb} (84%)
meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb renamed from meta-oe/recipes-support/libgit2/libgit2_0.28.3.bb +2 -1
similarity index 84%
rename from meta-oe/recipes-support/libgit2/libgit2_0.28.3.bb
rename to meta-oe/recipes-support/libgit2/libgit2_0.28.4.bb
index 82acc4926f..9b9c191049 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3f2cd5d3cccd71d62066ba619614592b"
 DEPENDS = "curl openssl zlib libssh2 libgcrypt"
 
 SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v0.28"
-SRCREV = "7ce88e66a19e3b48340abcdd86aeaae1882e63cc"
+SRCREV = "106a5f27586504ea371528191f0ea3aac2ad432b"
 
 S = "${WORKDIR}/git"
 
@@ -15,6 +15,7 @@ inherit cmake
 EXTRA_OECMAKE = "\
     -DBUILD_CLAR=OFF \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DLIB_INSTALL_DIR=${libdir} \
 "
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.24.1
author
#5 lore raw

PATCH 6/8 libinih: Fix multilib build

In reply to Khem Raj

Fixes
ERROR: libinih-0.0+gitrAUTOINC+25078f7156-r3 do_package: QA Issue: libinih: Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/libinih.a
/usr/lib/libinihcpp.a
/usr/lib/pkgconfig
/usr/lib/pkgconfig/inihcpp.pc
/usr/lib/pkgconfig/inih.pc

---
 ...rs-to-specify-multilib-specific-dirs.patch | 50 +++++++++++++++++++
 meta-oe/recipes-support/inih/libinih_git.bb   |  6 ++-
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-support/inih/libinih/0001-Use-GNUInstallDirs-to-specify-multilib-specific-dirs.patch
meta-oe/recipes-support/inih/libinih/0001-Use-GNUInstallDirs-to-specify-multilib-specific-dirs.patch new file +50 -0
new file mode 100644
index 0000000000..7fe7973f69
@@ -0,0 +1,50 @@
+From e99c040e32d261a61ca283ccfad7d1a3f5937922 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 18 Dec 2019 23:02:15 -0800
+Subject: [PATCH] Use GNUInstallDirs to specify multilib specific dirs
+
+Helps in building on arches where default baselib is lib64
+
+Upstream-Status: Submitted [https://github.com/OSSystems/inih/pull/3]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ CMakeLists.txt     | 6 ++++--
+ lib/CMakeLists.txt | 2 +-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 906b3e1..683a0c7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,8 +1,10 @@
+ cmake_minimum_required(VERSION 2.6)
+ project(inih)
+ 
+-add_subdirectory(lib)
++INCLUDE(GNUInstallDirs)
++
+ add_subdirectory(include)
++add_subdirectory(lib)
+ 
+ if( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
+   set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIC")
+@@ -10,4 +12,4 @@ endif( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
+ 
+ configure_file(inih.pc.in inih.pc @ONLY)
+ configure_file(inihcpp.pc.in inihcpp.pc @ONLY)
+-install(FILES ${CMAKE_BINARY_DIR}/inih.pc ${CMAKE_BINARY_DIR}/inihcpp.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++install(FILES ${CMAKE_BINARY_DIR}/inih.pc ${CMAKE_BINARY_DIR}/inihcpp.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index 63a16e9..18da39c 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -18,5 +18,5 @@ else(BUILD_SHARED_LIBS)
+   add_library(inihcpp STATIC ini.c INIReader.cpp)
+ endif(BUILD_SHARED_LIBS)
+ 
+-install(TARGETS inih inihcpp DESTINATION lib)
++install(TARGETS inih inihcpp DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+-- 
+2.24.1
+
meta-oe/recipes-support/inih/libinih_git.bb +4 -2
index 48271f721c..9bcb8c8800 100644
@@ -8,8 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dae28cbf28207425e0d0b3eb835f4bde"
 PR = "r3"
 
 # The github repository provides a cmake and pkg-config integration
-SRCREV = "25078f7156eb8647b3b35dd25f9ae6f8c4ee0589"
-SRC_URI = "git://github.com/OSSystems/inih.git"
+SRCREV = "ccfdd188894d01814d6e5e09cd97d3ff41521f43"
+SRC_URI = "git://github.com/OSSystems/inih.git \
+           file://0001-Use-GNUInstallDirs-to-specify-multilib-specific-dirs.patch \
+          "
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.24.1
author
#6 lore raw

PATCH 7/8 poco: Define LIB_SUFFIX per OE multilibs

In reply to Khem Raj
---
 meta-oe/recipes-support/poco/poco_1.9.4.bb | 1 +
 1 file changed, 1 insertion(+)
meta-oe/recipes-support/poco/poco_1.9.4.bb +1 -0
index c854481de3..f1dabcd012 100644
@@ -52,6 +52,7 @@ PACKAGECONFIG[SevenZip] = "-DENABLE_SEVENZIP=ON,-DENABLE_SEVENZIP=OFF"
 
 EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=RelWithDebInfo -DPOCO_UNBUNDLED=ON \
                   -DZLIB_LIBRARY_RELEASE:STRING=z -DPCRE_LIBRARY:STRING=pcre \
+                  -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
                  ${@bb.utils.contains('PTEST_ENABLED', '1', '-DENABLE_TESTS=ON ', '', d)}"
 
 # For the native build we want to use the bundled version
Signature · 1 line
2.24.1
author
#7 lore raw

PATCH 8/8 libcec: Fix multilib build

In reply to Khem Raj

Fixes
ERROR: libcec-4.0.4-r0 do_package: QA Issue: libcec: Files/directories were installed but not shipped in any package:
/usr/lib/python3.7/site-packages/_cec.so
/usr/lib/python3.7/site-packages/cec.py

---
 ...pport.cmake-Do-not-hardcode-lib-path.patch | 42 +++++++++++++++++++
 meta-oe/recipes-extended/libcec/libcec_git.bb |  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch
meta-oe/recipes-extended/libcec/libcec/0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch new file +42 -0
new file mode 100644
index 0000000000..3ecbfce250
@@ -0,0 +1,42 @@
+From 95d4df3b713925e2c4894a2e4d50b06df861d9ef Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Wed, 18 Dec 2019 23:37:40 -0800
+Subject: [PATCH] CheckPlatformSupport.cmake: Do not hardcode lib path
+
+Using CMAKE_INSTALL_LIBDIR ensures that we can build for multilib env
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/libcec/cmake/CheckPlatformSupport.cmake | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/libcec/cmake/CheckPlatformSupport.cmake b/src/libcec/cmake/CheckPlatformSupport.cmake
+index 2d7102f..55e78f8 100644
+--- a/src/libcec/cmake/CheckPlatformSupport.cmake
++++ b/src/libcec/cmake/CheckPlatformSupport.cmake
+@@ -224,16 +224,16 @@ else()
+ 
+       if (${PYTHON_MAJOR_VERSION} EQUAL 2)
+         install(TARGETS     ${SWIG_MODULE_cec_REAL_NAME}
+-                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec)
++                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH}/cec)
+         install(FILES       ${CMAKE_BINARY_DIR}/src/libcec/cec.py
+-                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
++                DESTINATION l${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
+         install(FILES ${CMAKE_SOURCE_DIR}/src/libcec/cmake/__init__.py
+-                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec)
++                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/cec)
+       else()
+         install(TARGETS     ${SWIG_MODULE_cec_REAL_NAME}
+-                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH})
++                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR}/${PYTHON_LIB_INSTALL_PATH})
+         install(FILES       ${CMAKE_BINARY_DIR}/src/libcec/cec.py
+-                DESTINATION lib/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
++                DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/${PYTHON_PKG_DIR})
+       endif()
+     endif()
+   endif()
+-- 
+2.24.1
+
meta-oe/recipes-extended/libcec/libcec_git.bb +2 -1
index eaf6b9b437..8d5a82455b 100644
@@ -13,7 +13,8 @@ PV = "4.0.4"
 
 SRCREV = "3bbd4321618503d14008387a72fabb6743878831"
 SRC_URI = "git://github.com/Pulse-Eight/libcec.git \
-"
+           file://0001-CheckPlatformSupport.cmake-Do-not-hardcode-lib-path.patch \
+          "
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.24.1