From fb95999a8000eb42af34b18cb6756e48d4475f64 Mon Sep 17 00:00:00 2001
From: Patricia Mendez Lorenzo <patricia.mendez@cern.ch>
Date: Wed, 27 Apr 2016 00:25:46 +0200
Subject: [PATCH] commiting changes for pyexternals
---
externals/CMakeLists.txt | 5 +++--
pyexternals/CMakeLists.txt | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index d190c73947..f4a278d5eb 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -572,8 +572,9 @@ LCGPackage_Add(
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/dist <INSTALL_DIR>
COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/lib/python2.7/site-packages
# COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/python/lib/py4j-0.9-src.zip <INSTALL_DIR>/lib/python2.7/site-packages/.
- COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/python/lib/pyspark.zip <INSTALL_DIR>/lib/python2.7/site-packages/.
- COMMAND ${CMAKE_COMMAND} -E unzip <INSTALL_DIR>/lib/python2.7/site-packages/pyspark.zip
+ COMMAND ${CMAKE_COMMAND} -E copy <INSTALL_DIR>/python/lib/pyspark.zip <INSTALL_DIR>/lib/python2.7/site-packages/.
+ COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR>/lib/python2.7/site-packages/ unzip pyspark.zip
+
BUILD_IN_SOURCE 1
)
diff --git a/pyexternals/CMakeLists.txt b/pyexternals/CMakeLists.txt
index 92e272a372..1af001661e 100644
--- a/pyexternals/CMakeLists.txt
+++ b/pyexternals/CMakeLists.txt
@@ -641,19 +641,19 @@ LCGPackage_Add(
#---py4j------------------------------------------------------------------------------------------------------
LCGPackage_Add(
py4j
- URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/py4j-${py4j_native_version}-src.zip
+ URL http://service-spi.web.cern.ch/service-spi/external/tarFiles/py4j-${py4j_native_version}.tar.gz
CONFIGURE_COMMAND <VOID>
- BUILD_COMMAND ${Python_cmd} setup.py build
+ BUILD_COMMAND ${Exec_cmd} PYTHONPATH=${pytools_home}/lib/python${Python_config_version_twodigit}/site-packages
+ ${Python_cmd} setup.py build
INSTALL_COMMAND ${Lock_cmd}
- COMMAND ${Python_cmd} setup.py install --prefix <INSTALL_DIR>
+ COMMAND ${Exec_cmd} PYTHONPATH=${pytools_home}/lib/python${Python_config_version_twodigit}/site-packages
+ ${Python_cmd} setup.py install --prefix <INSTALL_DIR>
COMMAND ${Unlock_cmd}
BUILD_IN_SOURCE 1
DEST_NAME pytools
DEPENDS Python
)
-
-
#---py------------------------------------------------------------------------------------------------------
LCGPackage_Add(
py
--
GitLab