[arch-commits] Commit in lensfun/trunk (PKGBUILD lensfun-fix-python-install-dir.patch)
Antonio Rojas
arojas at archlinux.org
Tue Jan 3 21:03:10 UTC 2017
Date: Tuesday, January 3, 2017 @ 21:03:09
Author: arojas
Revision: 285261
Fix install of python module (FS#52355)
Added:
lensfun/trunk/lensfun-fix-python-install-dir.patch
Modified:
lensfun/trunk/PKGBUILD
--------------------------------------+
PKGBUILD | 23 +++++++++++++++++------
lensfun-fix-python-install-dir.patch | 27 +++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-03 20:38:57 UTC (rev 285260)
+++ PKGBUILD 2017-01-03 21:03:09 UTC (rev 285261)
@@ -3,7 +3,7 @@
pkgname=lensfun
pkgver=0.3.2
-pkgrel=2
+pkgrel=3
pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
arch=(i686 x86_64)
url="http://lensfun.sourceforge.net"
@@ -10,16 +10,27 @@
license=('LGPL3')
depends=('glibc' 'glib2')
makedepends=('python' 'libpng' 'doxygen' 'cmake')
-source=("http://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('1d978b15aa7304d66a4931fa37ca9f8f89396c16')
+source=("http://sourceforge.net/projects/lensfun/files/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ lensfun-fix-python-install-dir.patch)
+sha1sums=('1d978b15aa7304d66a4931fa37ca9f8f89396c16'
+ '7bf2b17d0fb85800857eaf990541ea9eccca2f77')
+prepare() {
+ cd $pkgname-$pkgver
+ # Fix python module install path
+ patch -p1 -i ../lensfun-fix-python-install-dir.patch
+}
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
+ cd ${pkgname}-${pkgver}
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=lib
make all
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="$pkgdir" install
}
Added: lensfun-fix-python-install-dir.patch
===================================================================
--- lensfun-fix-python-install-dir.patch (rev 0)
+++ lensfun-fix-python-install-dir.patch 2017-01-03 21:03:09 UTC (rev 285261)
@@ -0,0 +1,27 @@
+From 3b46bb2a4eada7f29e016d586229782f6d1c35bb Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+Date: Sat, 9 Jan 2016 11:47:37 +0100
+Subject: [PATCH] cmake: fix DESTDIR installation for python
+
+When running `setup.py install`, respect the value of the DESTDIR
+environment variable so staged installs (used by distros, for example)
+work.
+---
+ apps/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
+index 70c77fd..2f6f8f1 100644
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -42,5 +42,5 @@ IF(PYTHON)
+ IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX)
+ SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+ ENDIF()
+- INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=${SETUP_PY_INSTALL_PREFIX})")
++ INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})")
+ ENDIF(PYTHON)
+--
+2.6.4
+
+
More information about the arch-commits
mailing list