Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b571fa1af0d8214e1f7a144e2ea854865e3159a6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b571fa1af0d8214e1f7a144e2ea854865e3159a6)
  • Date: Thu, 10 May 2012 14:06:17 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

devel/python3/DETAILS | 2 +-
devel/python3/HISTORY | 4 ++++
devel/python3/INSTALL | 9 +++++++++
libs/boost/DEPENDS | 2 +-
libs/boost/HISTORY | 4 ++++
libs/boost/PRE_BUILD | 6 ++++++
libs/boost/PRE_SUB_DEPENDS | 2 +-
libs/boost/REPAIR^all^PRE_SUB_DEPENDS | 2 +-
libs/boost/SUB_DEPENDS | 2 +-
libs/libusbx/DETAILS | 2 +-
libs/libusbx/HISTORY | 3 +++
11 files changed, 32 insertions(+), 6 deletions(-)

New commits:
commit b571fa1af0d8214e1f7a144e2ea854865e3159a6
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libusbx - fix url of libusb-compat

commit 8d95750e4884a66f8d5f10daecd3658d03993294
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

python3 - add some symlinks

commit 54344c1df49fbcbacd1062cb45ed3d0bdf393d3b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

boost - depends PYTHON

diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index 4009933..be02097 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,7 +1,7 @@
SPELL=python3
VERSION=3.2.3
SECURITY_PATCH=1
- PATCHLEVEL=0
+ PATCHLEVEL=1
SOURCE=Python-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index fddd5f6..775ed53 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,7 @@
+2012-04-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * INSTALL: add some symlinks
+ * DETAILS: PATCHLEVEL=1
+
2012-04-21 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: set flags for expat
* CONFIGURE: use correct flags for thread support
diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index 6031d78..4d52c1e 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -12,4 +12,13 @@ if [ -d
"${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" ];then
else
cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3" \
"${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2"
+fi &&
+# help some stupid installer scripts
+local PV=`echo ${VERSION}|cut -c-3` &&
+ln -sf ${TRACK_ROOT}/usr/include/python${PV}m
${INSTALL_ROOT}/usr/include/python${PV} &&
+# this is the primary/only version of python
+if [[ $PY3K == y ]]; then
+ ln -sf ${TRACK_ROOT}/usr/bin/python3 ${INSTALL_ROOT}/usr/bin/python &&
+ ln -sf ${TRACK_ROOT}/usr/bin/python3-config
${INSTALL_ROOT}/usr/bin/python-config &&
+ ln -sf ${TRACK_ROOT}/usr/lib/pkgconfig/python-${PV}.pc
${INSTALL_ROOT}/usr/lib/pkgconfig/python.pc
fi
diff --git a/libs/boost/DEPENDS b/libs/boost/DEPENDS
index 088c46b..850f8a9 100755
--- a/libs/boost/DEPENDS
+++ b/libs/boost/DEPENDS
@@ -2,7 +2,7 @@ depends -sub CXX gcc &&
if list_find "$BOOST_LIBS_MZ" "python" ||
[[ $BOOST_SELECT_LIBS == "n" ]]
then
- depends python
+ depends PYTHON
fi &&
if list_find "$BOOST_LIBS_AL" "graph" ||
[[ $BOOST_SELECT_LIBS == "n" ]]
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 6b37f31..5d0a681 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,7 @@
+2012-04-23 Treeeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS, *SUB_DEPENDS: python => PYTHON
+ * PRE_BUILD: fix detection of python3
+
2012-04-18 Sukneet Basuta <sukneet AT sourcemage.org>
* BUILD: Dont build with --with-libraries specified
when you don't select them, so all libs are built
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index ff9a3f2..5bdb55c 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -3,5 +3,11 @@ message "${MESSAGE_COLOR}Allow providing our own
CXXFLAGS...${DEFAULT_COLOR}" &&
patch $SOURCE_DIRECTORY/tools/build/v2/tools/gcc.jam \
$SCRIPT_DIRECTORY/boost-use-cxxflags.patch &&
patch -p1 -d $SOURCE_DIRECTORY <
$SCRIPT_DIRECTORY/converter_policies_hpp.patch &&
+
+if is_depends_enabled $SPELL python3;then
+ cd $SOURCE_DIRECTORY &&
+ sed -i 's/python$/&3/;s/sys.prefix/(&)/' bootstrap.sh
+fi &&
+
message "patching done"

diff --git a/libs/boost/PRE_SUB_DEPENDS b/libs/boost/PRE_SUB_DEPENDS
index 1fa0825..a363c9a 100755
--- a/libs/boost/PRE_SUB_DEPENDS
+++ b/libs/boost/PRE_SUB_DEPENDS
@@ -12,7 +12,7 @@ case $THIS_SUB_DEPENDS in
IOSTREAMS) list_find "$BOOST_LIBS_AL" iostreams ;;
RANDOM) list_find "$BOOST_LIBS_MZ" random ;;
SIGNALS) list_find "$BOOST_LIBS_MZ" signals ;;
- PYTHON) is_depends_enabled $SPELL python ;;
+ PYTHON) is_depends_enabled $SPELL PYTHON ;;
SYSTEM) list_find "$BOOST_LIBS_MZ" system ;;
THREAD) list_find "$BOOST_LIBS_MZ" thread ;;
CHRONO) list_find "$BOOST_LIBS_AL" chrono ;;
diff --git a/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
b/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
index 1fa0825..a363c9a 100755
--- a/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
@@ -12,7 +12,7 @@ case $THIS_SUB_DEPENDS in
IOSTREAMS) list_find "$BOOST_LIBS_AL" iostreams ;;
RANDOM) list_find "$BOOST_LIBS_MZ" random ;;
SIGNALS) list_find "$BOOST_LIBS_MZ" signals ;;
- PYTHON) is_depends_enabled $SPELL python ;;
+ PYTHON) is_depends_enabled $SPELL PYTHON ;;
SYSTEM) list_find "$BOOST_LIBS_MZ" system ;;
THREAD) list_find "$BOOST_LIBS_MZ" thread ;;
CHRONO) list_find "$BOOST_LIBS_AL" chrono ;;
diff --git a/libs/boost/SUB_DEPENDS b/libs/boost/SUB_DEPENDS
index 7ea7f21..1f5b591 100755
--- a/libs/boost/SUB_DEPENDS
+++ b/libs/boost/SUB_DEPENDS
@@ -11,7 +11,7 @@ case $THIS_SUB_DEPENDS in
RANDOM) list_add BOOST_LIBS_MZ random ;;
SIGNALS) list_add BOOST_LIBS_AL signals ;;
PYTHON) list_add BOOST_LIBS_MZ python &&
- depends python ;;
+ depends PYTHON ;;
SYSTEM) list_add BOOST_LIBS_MZ system ;;
THREAD) list_add BOOST_LIBS_MZ thread ;;
CHRONO) list_add BOOST_LIBS_AL chrono ;;
diff --git a/libs/libusbx/DETAILS b/libs/libusbx/DETAILS
index 779f9eb..71bc0e6 100755
--- a/libs/libusbx/DETAILS
+++ b/libs/libusbx/DETAILS
@@ -6,7 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE

SOURCE2=libusb-compat-0.1.4.tar.bz2
- SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
+ SOURCE2_URL[0]=$SOURCEFORGE_URL/libusb/$SOURCE2

SOURCE2_HASH=sha512:23214b362f3a3c2aa299678bf6da786ac3ff3c6a4299b392dee65b6ca7ffff68d8559f72549b16175f2fd44f45e127efdfc883895a1b39465a89f0b288b2fb7d

LICENSE[0]=LGPL
diff --git a/libs/libusbx/HISTORY b/libs/libusbx/HISTORY
index 6c2b21e..a7366fb 100644
--- a/libs/libusbx/HISTORY
+++ b/libs/libusbx/HISTORY
@@ -1,3 +1,6 @@
+2012-05-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: fix url for libusb-compat
+
2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.0.11, libusb-compat 0.1.4
spell created, cloned from libusb spell



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (b571fa1af0d8214e1f7a144e2ea854865e3159a6), Treeve Jelbert, 05/10/2012

Archive powered by MHonArc 2.6.24.

Top of Page