Add full relro. Drop support for i686 architecture. Cosmetics.

3 files changed, 39 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab306c364dcc..d1dfea1fb96c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = openvx
 	pkgdesc = An open, royalty-free standard for cross platform acceleration of computer vision applications
 	pkgver = 1.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.khronos.org/openvx/
-	arch = i686
 	arch = x86_64
-	license = APACHE
+	license = Apache
 	makedepends = cmake
 	makedepends = python
 	depends = gcc-libs
-	provides = libopenvx.so
-	provides = libvxu.so
 	noextract = openvx_sample_1.2.tar.bz2
 	source = https://www.khronos.org/registry/OpenVX/sample/openvx_sample_1.2.tar.bz2
+	source = openvx-add-full-relro.patch
 	source = openvx.pc
 	sha256sums = 8f61203572668f7719bc9f86bc24ca06c51a98531ca7941264bd7cbbaa7b9aaa
+	sha256sums = 1f85fb4b4729bf59ae8bf8a251991d52faac4d216e41937bd6c0d48a41f0b946
 	sha256sums = 92c695748c9be151c5eca9fc61da742fc391b45a623fb851ac56b80b5ab6cd40
 
 pkgname = openvx
diff --git a/PKGBUILD b/PKGBUILD
index eb2ca42cd19d..a2fac626de52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,20 @@
-# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
+# Maintainer: Daniel Bermond < gmail-com: danielbermond >
 
 pkgname=openvx
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='An open, royalty-free standard for cross platform acceleration of computer vision applications'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='https://www.khronos.org/openvx/'
-license=('APACHE')
+license=('Apache')
 depends=('gcc-libs')
 makedepends=('cmake' 'python')
-provides=('libopenvx.so' 'libvxu.so')
 source=("https://www.khronos.org/registry/OpenVX/sample/openvx_sample_${pkgver}.tar.bz2"
-        "${pkgname}.pc")
+        'openvx-add-full-relro.patch'
+        'openvx.pc')
 noextract=("openvx_sample_${pkgver}.tar.bz2")
 sha256sums=('8f61203572668f7719bc9f86bc24ca06c51a98531ca7941264bd7cbbaa7b9aaa'
+            '1f85fb4b4729bf59ae8bf8a251991d52faac4d216e41937bd6c0d48a41f0b946'
             '92c695748c9be151c5eca9fc61da742fc391b45a623fb851ac56b80b5ab6cd40')
 
 prepare() {
@@ -22,17 +23,17 @@ prepare() {
     
     # extract source file to a directory in the format ${pkgname}-${pkgver}
     tar xf ../"openvx_sample_${pkgver}.tar.bz2" --strip 1
+    
+    # add full relro
+    patch -Np1 -i "${srcdir}/openvx-add-full-relro.patch"
 }
 
 build() {
     cd "${pkgname}-${pkgver}"
     
-    [ "$CARCH" = 'x86_64' ] && _architecture='64'
-    [ "$CARCH" = 'i686'   ] && _architecture='32'
-    
     python Build.py \
         --os='Linux' \
-        --arch="$_architecture" \
+        --arch='64' \
         --conf='Release' \
         --gen='Unix Makefiles' \
         --build='True' \
@@ -45,25 +46,18 @@ build() {
 }
 
 package() {
-    [ "$CARCH" = 'x86_64' ] && _architecture='x64'
-    [ "$CARCH" = 'i686'   ] && _architecture='x32'
-    
-    # directories creation
-    mkdir -p "${pkgdir}/usr/"{include/VX,lib}
-    
-    # includes
-    cd "${pkgname}-${pkgver}/install/Linux/${_architecture}/Release/include/VX"
-    install -m644 * "${pkgdir}/usr/include/VX"
+    # headers
+    mkdir -p "${pkgdir}/usr/include"
+    cd "${pkgname}-${pkgver}/install/Linux/x64/Release/include"
+    cp -a * "${pkgdir}/usr/include"
     
     # libraries
-    cd "${srcdir}/${pkgname}-${pkgver}/install/Linux/${_architecture}/Release/bin"
-    install -m755 *.so "${pkgdir}/usr/lib"
+    cd "${srcdir}/${pkgname}-${pkgver}/install/Linux/x64/Release/bin"
+    install -D -m755 *.so* -t "${pkgdir}/usr/lib"
     
     # pkgconfig
-    cd "$srcdir"
-    install -D -m644 "${pkgname}.pc" "${pkgdir}/usr/lib/pkgconfig/${pkgname}.pc"
+    install -D -m644 "${srcdir}/${pkgname}.pc" -t "${pkgdir}/usr/lib/pkgconfig"
     
     # license
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
diff --git a/openvx-add-full-relro.patch b/openvx-add-full-relro.patch
new file mode 100644
index 000000000000..89d5533af5e4
--- /dev/null
+++ b/openvx-add-full-relro.patch
@@ -0,0 +1,16 @@
+diff -Naurp a/cmake_utils/CMake_linux_tools.cmake b/cmake_utils/CMake_linux_tools.cmake
+--- a/cmake_utils/CMake_linux_tools.cmake	2017-12-20 16:30:30.000000000 +0000
++++ b/cmake_utils/CMake_linux_tools.cmake	2019-06-09 13:11:12.189253983 +0000
+@@ -95,10 +95,10 @@ set( CMAKE_CXX_FLAGS_RELEASE
+ set( CMAKE_CXX_FLAGS_RELWITHDEBINFO         "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${ADD_C_FLAGS_RELWITHDEBINFO}")
+ 
+ # Linker switches - EXE
+-set( CMAKE_EXE_LINKER_FLAGS                 "${INIT_LINKER_FLAGS}")
++set( CMAKE_EXE_LINKER_FLAGS                 "${CMAKE_EXE_LINKER_FLAGS} ${INIT_LINKER_FLAGS}")
+ 
+ # Linker switches - DLL
+-set( CMAKE_SHARED_LINKER_FLAGS              "${INIT_LINKER_FLAGS} ${ADD_CMAKE_EXE_LINKER_FLAGS}")
++set( CMAKE_SHARED_LINKER_FLAGS              "${CMAKE_SHARED_LINKER_FLAGS} ${INIT_LINKER_FLAGS} ${ADD_CMAKE_EXE_LINKER_FLAGS}")
+ 
+ message(STATUS "\n\n** ** ** COMPILER Definitions ** ** **")
+ message(STATUS "CMAKE_C_COMPILER        = ${CMAKE_C_COMPILER}")