diff options
| author |   Dominik Kriegner <dominik.kriegner@aol.at> | 2012-03-15 23:59:36 +0100 |
|---|---|---|
| committer | Dominik Kriegner <dominik.kriegner@aol.at> | 2012-03-15 23:59:36 +0100 |
| commit | 6cff1f3d60c1391fffd4f323c0c3d0e85352e3df (patch) | |
| tree | 0943c46f580c5e010069de279a88b375bc77ca95 | |
| parent | syncevolution update to eapi4 (diff) | |
| download | anaximander-6cff1f3d60c1391fffd4f323c0c3d0e85352e3df.tar.gz anaximander-6cff1f3d60c1391fffd4f323c0c3d0e85352e3df.tar.bz2 anaximander-6cff1f3d60c1391fffd4f323c0c3d0e85352e3df.zip | |
update xrayutilities patch
| -rw-r--r-- | sci-physics/xrayutilities/Manifest | 2 | ||||
| -rw-r--r-- | sci-physics/xrayutilities/files/remove_python_package_install_from_scons.patch | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sci-physics/xrayutilities/Manifest b/sci-physics/xrayutilities/Manifest index e3de405..cf02fd5 100644 --- a/sci-physics/xrayutilities/Manifest +++ b/sci-physics/xrayutilities/Manifest @@ -1,2 +1,2 @@ -AUX remove_python_package_install_from_scons.patch 654 RMD160 e57a30141fd8ca5ceb49fe8c211df5ccd1838521 SHA1 28aa7b24d290409feb7cc7a39f9499efdeb4e93b SHA256 157bca395cf3d546989481b9d1f4204973d056e526eab6e7c6ae21efda242929 +AUX remove_python_package_install_from_scons.patch 716 RMD160 5daff03545436f9294946cf3f6b5a71d2e9e692c SHA1 e2d28cdd0f6e1d44b2b1f311e9463619bd4154ee SHA256 baad7004bd90199fd58ab24f86f50b1e316cd7d130f1f0b4573db4c27d71b2c5 EBUILD xrayutilities-9999.ebuild 837 RMD160 d816b2aa9d26049afb67cd18f6db95fc27cf4451 SHA1 cf549d57667ed3985334308c7b7d2ed2b886bc69 SHA256 0ce990bb8010ebbec6e3b22310779061cea5533b36da639ccc4687fcbd62e702 diff --git a/sci-physics/xrayutilities/files/remove_python_package_install_from_scons.patch b/sci-physics/xrayutilities/files/remove_python_package_install_from_scons.patch index 2c6408e..6a540c3 100644 --- a/sci-physics/xrayutilities/files/remove_python_package_install_from_scons.patch +++ b/sci-physics/xrayutilities/files/remove_python_package_install_from_scons.patch @@ -1,12 +1,12 @@ ---- SConstruct.orig 2012-03-05 21:59:49.532174007 +0100 -+++ SConstruct 2012-03-05 22:00:14.212174572 +0100 -@@ -77,12 +77,6 @@ +--- SConstruct.orig 2012-03-15 23:29:26.655890118 +0100 ++++ SConstruct 2012-03-15 23:30:16.166549130 +0100 +@@ -79,12 +79,6 @@ fid.write("clib_path = %s\n" %libpath) fid.close() print("create clib_path.conf file (libfile: %s)"%(libpath)) - #run python installer -- if "win" in os.sys.platform: -- python_installer = subprocess.Popen("python setup.py install --prefix="+env['PREFIX'],shell=True) +- if "win" in os.sys.platform or env['DESTDIR'] == "" or env['DESTDIR'] == "${DESTDIR}": +- python_installer = subprocess.Popen("python setup.py install --prefix=%s"%(env['PREFIX']),shell=True) - else: - python_installer = subprocess.Popen("python setup.py install --root=%s --prefix=%s" %(env['DESTDIR'],env['PREFIX']),shell=True) - python_installer.wait() |