summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-11-09 22:15:42 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-11-09 22:15:42 +0100
commit7c980e275971d46a2be50ebe564c0125cb759727 (patch)
tree13aaed0e9158aa1f2c55908a6e50e05fd1798ffc /package
parent793044fd96bca30ad6b02e75e4972be89dc6bd72 (diff)
try to fix bzr, unify python support
Diffstat (limited to 'package')
-rw-r--r--package/bzr/Makefile23
-rw-r--r--package/cherrypy/Makefile11
-rw-r--r--package/pyrex/Makefile35
3 files changed, 50 insertions, 19 deletions
diff --git a/package/bzr/Makefile b/package/bzr/Makefile
index 7b6836cae..ba8aba484 100644
--- a/package/bzr/Makefile
+++ b/package/bzr/Makefile
@@ -4,31 +4,30 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= bzr
-PKG_VERSION:= 2.0.4
+PKG_VERSION:= 2.3b3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 0b253f59601ebc9ee5975c612fc65f43
+PKG_MD5SUM:= 94f9181b9a4ab84b94cfbc06bd5dfd91
PKG_DESCR:= bazaar
PKG_SECTION:= scm
PKG_DEPENDS:= python2
PKG_BUILDDEP:= python2
PKG_URL:= http://bazaar.canonical.com/en/
-PKG_SITES:= http://launchpad.net/bzr/2.0/${PKG_VERSION}/+download/
+PKG_SITES:= http://launchpad.net/bzr/2.3/${PKG_VERSION}/+download/
include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,BZR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-PYTHON_VERSION=2.6
-PYTHON_DIR:=$(STAGING_DIR)/usr
-PYTHON_BIN_DIR:=$(PYTHON_DIR)/bin
-PYTHON_INC_DIR:=$(PYTHON_DIR)/include/python$(PYTHON_VERSION)
-PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib/python$(PYTHON_VERSION)
-PYTHON:=python$(PYTHON_VERSION)
-PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
-
CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
+
+include $(TOPDIR)/mk/python.mk
+
+do-build:
+ cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr"
-post-install:
+do-install:
$(INSTALL_DIR) $(IDIR_BZR)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/bzr \
$(IDIR_BZR)/usr/bin
diff --git a/package/cherrypy/Makefile b/package/cherrypy/Makefile
index 00de2f994..90df54b04 100644
--- a/package/cherrypy/Makefile
+++ b/package/cherrypy/Makefile
@@ -16,20 +16,17 @@ PKG_SITES:= http://download.cherrypy.org/cherrypy/3.2.0rc1/
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,CHERRYPY,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CHERRYPY,cherrypy,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-PYTHON_VERSION=2.7
-PYTHON_DIR:=$(STAGING_TOOLS)
-PYTHON_LIB_DIR:=$(PYTHON_DIR)/lib
-PYTHON:=${STAGING_TOOLS}/bin/hostpython
+include $(TOPDIR)/mk/python.mk
do-build:
- cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIB_DIR) $(PYTHON) ./setup.py build
- cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIB_DIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr"
+ cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build
+ cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr"
do-install:
$(INSTALL_DIR) $(IDIR_CHERRYPY)/usr/bin
diff --git a/package/pyrex/Makefile b/package/pyrex/Makefile
new file mode 100644
index 000000000..97b497a55
--- /dev/null
+++ b/package/pyrex/Makefile
@@ -0,0 +1,35 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= Pyrex
+PKG_VERSION:= 0.9.9
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 515dee67d15d4393841e2d60e8341947
+PKG_DESCR:= mixes Python and C data types
+PKG_SECTION:= libs
+PKG_URL:= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
+PKG_SITES:= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PYREX,pyrex,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
+
+include $(TOPDIR)/mk/python.mk
+
+do-build:
+ cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build
+ cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(STAGING_TOOLS)"
+ cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr"
+
+do-install:
+ $(INSTALL_DIR) $(IDIR_PYREX)/usr/lib/python$(PYTHON_VERSION)
+ $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/* \
+ $(IDIR_PYREX)/usr/lib/python$(PYTHON_VERSION)
+
+include ${TOPDIR}/mk/pkg-bottom.mk