* [Buildroot] [git commit] python-dialog: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=d3e65118132968b6575a98431337a5300e38879d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-dialog/python-dialog.mk | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/package/python-dialog/python-dialog.mk b/package/python-dialog/python-dialog.mk
index fa496de..e6887c9 100644
--- a/package/python-dialog/python-dialog.mk
+++ b/package/python-dialog/python-dialog.mk
@@ -9,15 +9,7 @@ PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
PYTHON_DIALOG_LICENSE = LGPLv2.1+
PYTHON_DIALOG_LICENSE_FILES = COPYING
+PYTHON_DIALOG_SETUP_TYPE = distutils
+PYTHON_DIALOG_DEPENDENCIES = dialog
-PYTHON_DIALOG_DEPENDENCIES = python dialog
-
-define PYTHON_DIALOG_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define PYTHON_DIALOG_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-thrift: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=0a0ea0a19eae540711d858d6e0dcca55390e9676
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-thrift/python-thrift.mk | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/package/python-thrift/python-thrift.mk b/package/python-thrift/python-thrift.mk
index 91e14e5..8abad48 100644
--- a/package/python-thrift/python-thrift.mk
+++ b/package/python-thrift/python-thrift.mk
@@ -9,27 +9,7 @@ PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz
PYTHON_THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(PYTHON_THRIFT_VERSION)
PYTHON_THRIFT_LICENSE = Apache-2.0
PYTHON_THRIFT_LICENSE_FILES = LICENSE
-PYTHON_THRIFT_DEPENDENCIES = python
+PYTHON_THRIFT_SETUP_TYPE = setuptools
+PYTHON_THRIFT_SUBDIR = lib/py
-define PYTHON_THRIFT_BUILD_CMDS
- (cd $(@D)/lib/py; \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDSHARED="$(TARGET_CROSS)gcc -shared" \
- CROSS_COMPILING=yes \
- _python_sysroot=$(STAGING_DIR) \
- _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
- _python_prefix=/usr \
- _python_exec_prefix=/usr \
- $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-# host-distutilscross, if it has been installed before, will check that
-# the installation directory is in python's load path. For host-python,
-# it is not, so add it explicitly while installing to target.
-define PYTHON_THRIFT_INSTALL_TARGET_CMDS
- (cd $(@D)/lib/py; PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
- $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-distutilscross: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=b8b9ef8934c510dfee7e27951dedcc755e52578c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
.../python-distutilscross/python-distutilscross.mk | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/package/python-distutilscross/python-distutilscross.mk b/package/python-distutilscross/python-distutilscross.mk
index df12f97..cfe2811 100644
--- a/package/python-distutilscross/python-distutilscross.mk
+++ b/package/python-distutilscross/python-distutilscross.mk
@@ -7,15 +7,6 @@
PYTHON_DISTUTILSCROSS_VERSION = 0.1
PYTHON_DISTUTILSCROSS_SOURCE = distutilscross-$(PYTHON_DISTUTILSCROSS_VERSION).tar.gz
PYTHON_DISTUTILSCROSS_SITE = http://pypi.python.org/packages/source/d/distutilscross
+PYTHON_DISTUTILSCROSS_SETUP_TYPE = setuptools
-HOST_PYTHON_DISTUTILSCROSS_DEPENDENCIES = host-python host-python-setuptools
-
-define HOST_PYTHON_DISTUTILSCROSS_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define HOST_PYTHON_DISTUTILSCROSS_INSTALL_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
-endef
-
-$(eval $(host-generic-package))
+$(eval $(host-python-package))
^ permalink raw reply related
* [Buildroot] [git commit] supervisor: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=0935498a76d4a86d8d998ebb8d42c74af5a26075
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Remove the select of BR2_PACKAGE_PYTHON_SETUPTOOLS, since what is
really needed is host-setuptools (as can be seen from the original .mk
file), and not setuptools for the target.
Also, remove the mangling of the Python shebang, since it's now done
by passing the --executable= option at install time (done in the
Python package infrastructure).
Finally, convert the package to use <pkg>_INSTALL_INIT_SYSV.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/supervisor/Config.in | 1 -
package/supervisor/supervisor.mk | 22 +++++++++++-----------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/package/supervisor/Config.in b/package/supervisor/Config.in
index 5340181..c511dd8 100644
--- a/package/supervisor/Config.in
+++ b/package/supervisor/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_SUPERVISOR
bool "supervisor"
depends on BR2_PACKAGE_PYTHON
- select BR2_PACKAGE_PYTHON_SETUPTOOLS
select BR2_PACKAGE_PYTHON_MELD3
help
A client/server system that allows its users to control a
diff --git a/package/supervisor/supervisor.mk b/package/supervisor/supervisor.mk
index 40ad8ce..d2d58e2 100644
--- a/package/supervisor/supervisor.mk
+++ b/package/supervisor/supervisor.mk
@@ -7,19 +7,19 @@
SUPERVISOR_VERSION = 3.0a12
SUPERVISOR_SITE = http://pypi.python.org/packages/source/s/supervisor/
SUPERVISOR_LICENSE_FILES = LICENSES.txt
+SUPERVISOR_SETUP_TYPE = setuptools
-SUPERVISOR_DEPENDENCIES = python host-python-setuptools
-
-define SUPERVISOR_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
+define SUPERVISOR_INSTALL_CONF_FILES
+ $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/supervisor.d
+ $(INSTALL) -D -m 644 package/supervisor/supervisord.conf \
+ $(TARGET_DIR)/etc/supervisord.conf
endef
-define SUPERVISOR_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=/usr --root=$(TARGET_DIR))
- sed -i '1s|#!.*python.*|#!/usr/bin/env python|' $(TARGET_DIR)/usr/bin/{echo_supervisord_conf,pidproxy,supervisorctl,supervisord}
- $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/supervisor.d
- $(INSTALL) -D -m 644 package/supervisor/supervisord.conf $(TARGET_DIR)/etc/supervisord.conf
- $(INSTALL) -m 755 package/supervisor/S99supervisord $(TARGET_DIR)/etc/init.d/S99supervisord
+SUPERVISOR_POST_INSTALL_TARGET_HOOKS += SUPERVISOR_INSTALL_CONF_FILES
+
+define SUPERVISOR_INSTALL_INIT_SYSV
+ $(INSTALL) -D -m 755 package/supervisor/S99supervisord \
+ $(TARGET_DIR)/etc/init.d/S99supervisord
endef
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-netifaces: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:41 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=8fd5a94562b771b56e1b06d6b3ea9b9a19e1a52a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Also, remove the "select BR2_PACKAGE_PYTHON_SETUPTOOLS", since
setuptools is a host dependency (needed to built the package), not a
target dependency.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-netifaces/Config.in | 1 -
package/python-netifaces/python-netifaces.mk | 19 ++-----------------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/package/python-netifaces/Config.in b/package/python-netifaces/Config.in
index b9d66d8..29f9fc3 100644
--- a/package/python-netifaces/Config.in
+++ b/package/python-netifaces/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_PYTHON_NETIFACES
bool "python-netifaces"
depends on BR2_PACKAGE_PYTHON
- select BR2_PACKAGE_PYTHON_SETUPTOOLS
help
Portable access to network interfaces from Python.
diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
index 1570fd1..faa39bd 100644
--- a/package/python-netifaces/python-netifaces.mk
+++ b/package/python-netifaces/python-netifaces.mk
@@ -7,21 +7,6 @@
PYTHON_NETIFACES_VERSION = 0.7
PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
PYTHON_NETIFACES_SITE = http://alastairs-place.net/projects/netifaces
+PYTHON_NETIFACES_SETUP_TYPE = setuptools
-PYTHON_NETIFACES_DEPENDENCIES = python host-python-setuptools host-python-distutilscross
-
-define PYTHON_NETIFACES_BUILD_CMDS
- (cd $(@D); \
- PYTHONXCPREFIX="$(STAGING_DIR)/usr/" \
- LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
- $(HOST_DIR)/usr/bin/python setup.py build -x)
-endef
-
-define PYTHON_NETIFACES_INSTALL_TARGET_CMDS
- (cd $(@D); \
- PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
- $(HOST_DIR)/usr/bin/python setup.py install \
- --single-version-externally-managed --root=/ --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] scons: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:39 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a69b2d3926826d72374800ac8eda6646aa0aa078
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/scons/scons.mk | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/package/scons/scons.mk b/package/scons/scons.mk
index a7747d5..e3fad1b 100644
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -8,17 +8,12 @@ SCONS_VERSION = 2.3.0
SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
SCONS_LICENSE = MIT
SCONS_LICENSE_FILES = LICENSE.txt
+SCONS_SETUP_TYPE = distutils
-define HOST_SCONS_BUILD_CMDS
- (cd $(@D); python setup.py build)
-endef
+HOST_SCONS_INSTALL_OPT = \
+ --install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION)
-define HOST_SCONS_INSTALL_CMDS
- (cd $(@D); python setup.py install --prefix=$(HOST_DIR)/usr \
- --install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION))
-endef
-
-$(eval $(host-generic-package))
+$(eval $(host-python-package))
# variables used by other packages
SCONS = $(HOST_DIR)/usr/bin/scons
^ permalink raw reply related
* [Buildroot] [git commit] python-setuptools: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:39 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3fcb28e7a15eb6dd3e768528fac5c9293b11e0a4
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-setuptools/python-setuptools.mk | 28 ++---------------------
1 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
index 73c819f..13df448 100644
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -12,29 +12,7 @@
PYTHON_SETUPTOOLS_VERSION = 0.6.36
PYTHON_SETUPTOOLS_SOURCE = distribute-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
PYTHON_SETUPTOOLS_SITE = http://pypi.python.org/packages/source/d/distribute
-PYTHON_SETUPTOOLS_DEPENDENCIES = python
+PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
-define HOST_PYTHON_SETUPTOOLS_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define PYTHON_SETUPTOOLS_BUILD_CMDS
- (cd $(@D); \
- PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
- $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define HOST_PYTHON_SETUPTOOLS_INSTALL_CMDS
- (cd $(@D); \
- $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
-endef
-
-define PYTHON_SETUPTOOLS_INSTALL_TARGET_CMDS
- (cd $(@D); \
- PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
- $(HOST_DIR)/usr/bin/python setup.py install --executable=/usr/bin/python \
- --single-version-externally-managed --root=/ --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
-$(eval $(host-generic-package))
+$(eval $(python-package))
+$(eval $(host-python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-serial: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:38 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=5da217204c5d499541237aa54056d32ab0ed5c95
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-serial/python-serial.mk | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
index e00577b..a44d799 100644
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -7,15 +7,6 @@
PYTHON_SERIAL_VERSION = 2.6
PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
PYTHON_SERIAL_SITE = http://pypi.python.org/packages/source/p/pyserial
+PYTHON_SERIAL_SETUP_TYPE = distutils
-PYTHON_SERIAL_DEPENDENCIES = python
-
-define PYTHON_SERIAL_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build --executable=/usr/bin/python)
-endef
-
-define PYTHON_SERIAL_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-pyzmq: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:38 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=3485afbce67de30ea486357971e2afae9555ee28
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-pyzmq/python-pyzmq.mk | 26 +++-----------------------
1 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk
index e9702fc..b3a8f9d 100644
--- a/package/python-pyzmq/python-pyzmq.mk
+++ b/package/python-pyzmq/python-pyzmq.mk
@@ -10,7 +10,8 @@ PYTHON_PYZMQ_SITE = http://pypi.python.org/packages/source/p/pyzmq/
PYTHON_PYZMQ_LICENSE = LGPLv3+ BSD-3c Apache License Version 2.0
# Apache license only online: http://www.apache.org/licenses/LICENSE-2.0
PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD
-PYTHON_PYZMQ_DEPENDENCIES = zeromq python host-python
+PYTHON_PYZMQ_DEPENDENCIES = zeromq
+PYTHON_PYZMQ_SETUP_TYPE = distutils
# Due to issues with cross-compiling, hardcode to the zeromq in BR
define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION
@@ -20,25 +21,4 @@ endef
PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION
-PYTHON_PYZMQ_PARAMS = CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDSHARED="$(TARGET_CC) -shared" \
- CROSS_COMPILING=yes \
- _python_sysroot=$(STAGING_DIR) \
- _python_srcdir=$(PYTHON_DIR) \
- _python_prefix=/usr \
- _python_exec_prefix=/usr
-
-define PYTHON_PYZMQ_CONFIGURE_CMDS
- (cd $(@D); $(PYTHON_PYZMQ_PARAMS) \
- $(HOST_DIR)/usr/bin/python setup.py configure \
- --zmq=$(STAGING_DIR)/usr)
-endef
-
-define PYTHON_PYZMQ_INSTALL_TARGET_CMDS
- (cd $(@D); $(PYTHON_PYZMQ_PARAMS) \
- $(HOST_DIR)/usr/bin/python setup.py install \
- --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-pyro: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:38 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=fac776c8ccc41dc030345d5c5286485b47b17c9f
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-pyro/python-pyro.mk | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk
index 67aabc6..6f118ba 100644
--- a/package/python-pyro/python-pyro.mk
+++ b/package/python-pyro/python-pyro.mk
@@ -9,10 +9,6 @@ PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
PYTHON_PYRO_SITE = https://pypi.python.org/packages/source/P/Pyro/
PYTHON_PYRO_LICENSE = MIT
PYTHON_PYRO_LICENSE_FILES = LICENSE
-PYTHON_PYRO_DEPENDENCIES = python
+PYTHON_PYRO_SETUP_TYPE = distutils
-define PYTHON_PYRO_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-pyparsing: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:38 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=7cce98611b40f2db170eee57376d7f130b2199fa
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-pyparsing/python-pyparsing.mk | 28 +------------------------
1 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk
index 7814ce3..07dda58 100644
--- a/package/python-pyparsing/python-pyparsing.mk
+++ b/package/python-pyparsing/python-pyparsing.mk
@@ -9,30 +9,6 @@ PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
PYTHON_PYPARSING_SITE = http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-$(PYTHON_PYPARSING_VERSION)
PYTHON_PYPARSING_LICENSE = MIT
PYTHON_PYPARSING_LICENSE_FILES = LICENSE
-PYTHON_PYPARSING_INSTALL_STAGING = YES
-PYTHON_PYPARSING_DEPENDENCIES = python
+PYTHON_PYPARSING_SETUP_TYPE = distutils
-# Shamelessly vampirised from python-pygame ;-)
-define PYTHON_PYPARSING_BUILD_CMDS
- (cd $(@D); \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDSHARED="$(TARGET_CROSS)gcc -shared" \
- CROSS_COMPILING=yes \
- _python_sysroot=$(STAGING_DIR) \
- _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
- _python_prefix=/usr \
- _python_exec_prefix=/usr \
- $(HOST_DIR)/usr/bin/python setup.py build \
- )
-endef
-
-# Shamelessly vampirised from python-pygame ;-)
-define PYTHON_PYPARSING_INSTALL_TARGET_CMDS
- (cd $(@D); \
- $(HOST_DIR)/usr/bin/python setup.py install \
- --prefix=$(TARGET_DIR)/usr \
- )
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-pygame: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:38 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=ba2e9e0fa960ebe948d5e30a41b7db19c17a0c4d
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-pygame/python-pygame.mk | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/package/python-pygame/python-pygame.mk b/package/python-pygame/python-pygame.mk
index 9db5a3f..681b36c 100644
--- a/package/python-pygame/python-pygame.mk
+++ b/package/python-pygame/python-pygame.mk
@@ -10,6 +10,7 @@ PYTHON_PYGAME_VERSION = f0bb4a4b365d
PYTHON_PYGAME_SOURCE = pygame-$(PYTHON_PYGAME_VERSION).tar.gz
PYTHON_PYGAME_SITE = https://bitbucket.org/pygame/pygame
PYTHON_PYGAME_SITE_METHOD = hg
+PYTHON_PYGAME_SETUP_TYPE = distutils
ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
PYTHON_PYGAME_OPT_DEPENDS += sdl_image
@@ -23,7 +24,7 @@ ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y)
PYTHON_PYGAME_OPT_DEPENDS += sdl_mixer
endif
-PYTHON_PYGAME_DEPENDENCIES = python sdl $(PYTHON_PYGAME_OPT_DEPENDS)
+PYTHON_PYGAME_DEPENDENCIES = sdl $(PYTHON_PYGAME_OPT_DEPENDS)
ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
define PYTHON_PYGAME_UNCONFIGURE_IMAGE
@@ -81,28 +82,18 @@ define PYTHON_PYGAME_CONFIGURE_CMDS
$(PYTHON_PYGAME_UNCONFIGURE_SCRAP)
endef
-define PYTHON_PYGAME_BUILD_CMDS
- (cd $(@D); CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
- LDSHARED="$(TARGET_CROSS)gcc -shared" \
- CROSS_COMPILING=yes \
- _python_sysroot=$(STAGING_DIR) \
- _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
- _python_prefix=/usr \
- _python_exec_prefix=/usr \
- $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
ifneq ($(BR2_HAVE_DOCUMENTATION),y)
define PYTHON_PYGAME_REMOVE_DOC
rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs
endef
+
+PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_DOC
endif
-define PYTHON_PYGAME_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install \
- --prefix=$(TARGET_DIR)/usr)
+define PYTHON_PYGAME_REMOVE_TESTS
rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests
- $(PYTHON_PYGAME_REMOVE_DOC)
endef
-$(eval $(generic-package))
+PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS
+
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-protobuf: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=033e218c34398afc1c52c7d30216e13bf5242582
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-protobuf/python-protobuf.mk | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk
index dcf67c2..36ab644 100644
--- a/package/python-protobuf/python-protobuf.mk
+++ b/package/python-protobuf/python-protobuf.mk
@@ -9,20 +9,8 @@ PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE)
PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
PYTHON_PROTOBUF_LICENSE = BSD-3c
PYTHON_PROTOBUF_LICENSE_FILES = COPYING.txt
+PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf
+PYTHON_PROTOBUF_SETUP_TYPE = setuptools
+PYTHON_PROTOBUF_SUBDIR = python
-PYTHON_PROTOBUF_DEPENDENCIES = python host-python-setuptools \
- host-python-distutilscross host-protobuf
-
-define PYTHON_PROTOBUF_BUILD_CMDS
- (cd $(@D)/python; \
- PYTHONXCPREFIX="$(STAGING_DIR)/usr/" \
- PATH=$(HOST_PATH) \
- $(HOST_DIR)/usr/bin/python setup.py build -x)
-endef
-
-define PYTHON_PROTOBUF_INSTALL_TARGET_CMDS
- (cd $(@D)/python; PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
- $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-nfc: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=527302e73f0ab19b85c2ddf3ff2fd407dd32957b
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-nfc/python-nfc.mk | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk
index f406e2a..5f486d9 100644
--- a/package/python-nfc/python-nfc.mk
+++ b/package/python-nfc/python-nfc.mk
@@ -7,14 +7,7 @@
PYTHON_NFC_VERSION = 142
PYTHON_NFC_SITE = https://launchpad.net/nfcpy
PYTHON_NFC_SITE_METHOD = bzr
-PYTHON_NFC_DEPENDENCIES = python libusb libusb-compat
+PYTHON_NFC_DEPENDENCIES = libusb libusb-compat
+PYTHON_NFC_SETUP_TYPE = distutils
-define PYTHON_NFC_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define PYTHON_NFC_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-meld3: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=f9167f5a38fb7a879bc4bd5afd03a553060d5e08
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-meld3/python-meld3.mk | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/package/python-meld3/python-meld3.mk b/package/python-meld3/python-meld3.mk
index 27da9c8..cb8dec0 100644
--- a/package/python-meld3/python-meld3.mk
+++ b/package/python-meld3/python-meld3.mk
@@ -7,16 +7,8 @@
PYTHON_MELD3_VERSION = 0.6.8
PYTHON_MELD3_SOURCE = meld3-$(PYTHON_MELD3_VERSION).tar.gz
PYTHON_MELD3_SITE = http://pypi.python.org/packages/source/m/meld3/
-PYTHON_MELD3_DEPENDENCIES = python
PYTHON_MELD3_LICENSE = ZPLv2.1
PYTHON_MELD3_LICENSE_FILES = COPYRIGHT.txt LICENSE.txt
+PYTHON_MELD3_SETUP_TYPE = distutils
-define PYTHON_MELD3_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define PYTHON_MELD3_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-mad: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=f085d1f425681ae3742dc3f2d99a77ce5b874758
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-mad/python-mad.mk | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/package/python-mad/python-mad.mk b/package/python-mad/python-mad.mk
index eaa1fae..1b3cb75 100644
--- a/package/python-mad/python-mad.mk
+++ b/package/python-mad/python-mad.mk
@@ -7,8 +7,9 @@
PYTHON_MAD_VERSION = 0.6
PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz
PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download/
+PYTHON_MAD_SETUP_TYPE = distutils
-PYTHON_MAD_DEPENDENCIES = python libmad
+PYTHON_MAD_DEPENDENCIES = libmad
ifeq ($(BR2_ENDIAN),"LITTLE")
PYTHON_MAD_ENDIAN=little
@@ -23,19 +24,4 @@ define PYTHON_MAD_CONFIGURE_CMDS
echo "mad_include_dir = $(STAGING_DIR)/usr/include" >> $(@D)/Setup
endef
-define PYTHON_MAD_BUILD_CMDS
- (cd $(@D); \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDSHARED="$(TARGET_CC) -shared" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- $(HOST_DIR)/usr/bin/python setup.py build_ext \
- --include-dirs=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR))
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define PYTHON_MAD_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-m2crypto: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:37 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=dcd90b00ed7c37b1380a2e12a3f9761c75f19a9f
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-m2crypto/python-m2crypto.mk | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk
index 1c0efbd..dd0f77e 100644
--- a/package/python-m2crypto/python-m2crypto.mk
+++ b/package/python-m2crypto/python-m2crypto.mk
@@ -7,20 +7,16 @@
PYTHON_M2CRYPTO_VERSION = 0.21.1
PYTHON_M2CRYPTO_SITE = http://pypi.python.org/packages/source/M/M2Crypto
PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz
-HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-python host-python-setuptools host-swig
+PYTHON_M2CRYPTO_SETUP_TYPE = setuptools
+HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig
+# We need to override the build commands to be able to use build_ext,
+# which accepts the --openssl option.
define HOST_PYTHON_M2CRYPTO_BUILD_CMDS
(cd $(@D); \
- $(HOST_CONFIGURE_OPTS) \
- PYTHONXCPREFIX="$(HOST_DIR)/usr/" \
- LDFLAGS="-L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib" \
- $(HOST_DIR)/usr/bin/python setup.py build_ext --openssl=$(HOST_DIR)/usr)
+ $(HOST_PKG_PYTHON_SETUPTOOLS_ENV) \
+ $(HOST_DIR)/usr/bin/python setup.py build_ext \
+ --openssl=$(HOST_DIR)/usr)
endef
-define HOST_PYTHON_M2CRYPTO_INSTALL_CMDS
- (cd $(@D); \
- PYTHONPATH=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
- $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr)
-endef
-
-$(eval $(host-generic-package))
+$(eval $(host-python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-ipy: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:36 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=1825edece08e4bc5e5e7c52268ff39cb7cdc174c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-ipy/python-ipy.mk | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk
index c03f91f..6e05ee9 100644
--- a/package/python-ipy/python-ipy.mk
+++ b/package/python-ipy/python-ipy.mk
@@ -6,21 +6,8 @@
PYTHON_IPY_VERSION = IPy-0.75
PYTHON_IPY_SITE = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION))
-PYTHON_IPY_DEPENDENCIES = host-python python
PYTHON_IPY_LICENSE = BSD-3c
PYTHON_IPY_LICENSE_FILES = COPYING
+PYTHON_IPY_SETUP_TYPE = distutils
-define PYTHON_IPY_BUILD_CMDS
- (cd $(@D); \
- $(TARGET_CONFIGURE_OPTS) \
- $(HOST_DIR)/usr/bin/python setup.py build_ext \
- --include-dirs=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \
- )
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define PYTHON_IPY_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-id3: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:36 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=d26c5bc2e9945f4b2b0b8d130ada6dfa1a7957b9
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-id3/python-id3.mk | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/package/python-id3/python-id3.mk b/package/python-id3/python-id3.mk
index 9328a0f..5957f64 100644
--- a/package/python-id3/python-id3.mk
+++ b/package/python-id3/python-id3.mk
@@ -7,15 +7,6 @@
PYTHON_ID3_VERSION = 1.2
PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz
PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION)
+PYTHON_ID3_SETUP_TYPE = distutils
-PYTHON_ID3_DEPENDENCIES = python
-
-define PYTHON_ID3_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define PYTHON_ID3_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-dpkt: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:36 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=d6c20a3524513c39dfb2d47251c2cccd384b5b8f
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-dpkt/python-dpkt.mk | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/package/python-dpkt/python-dpkt.mk b/package/python-dpkt/python-dpkt.mk
index 314415c..0b3dc11 100644
--- a/package/python-dpkt/python-dpkt.mk
+++ b/package/python-dpkt/python-dpkt.mk
@@ -7,15 +7,6 @@
PYTHON_DPKT_VERSION = 1.7
PYTHON_DPKT_SOURCE = dpkt-$(PYTHON_DPKT_VERSION).tar.gz
PYTHON_DPKT_SITE = http://dpkt.googlecode.com/files
+PYTHON_DPKT_SETUP_TYPE = distutils
-PYTHON_DPKT_DEPENDENCIES = python
-
-define PYTHON_DPKT_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define PYTHON_DPKT_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-crc16: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:36 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a1cc00e1725e2c6b0b88e46d2f7a264ca65ae9f7
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-crc16/python-crc16.mk | 25 ++-----------------------
1 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/package/python-crc16/python-crc16.mk b/package/python-crc16/python-crc16.mk
index adfdcc6..9dd09ae 100644
--- a/package/python-crc16/python-crc16.mk
+++ b/package/python-crc16/python-crc16.mk
@@ -9,27 +9,6 @@ PYTHON_CRC16_SOURCE = crc16-$(PYTHON_CRC16_VERSION).tar.gz
PYTHON_CRC16_SITE = http://pycrc16.googlecode.com/files/
PYTHON_CRC16_LICENSE = LGPLv3+
PYTHON_CRC16_LICENSE_FILES = COPYING.txt
-PYTHON_CRC16_DEPENDENCIES = python host-python
+PYTHON_CRC16_SETUP_TYPE = distutils
-PYTHON_CRC16_PARAMS = CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDSHARED="$(TARGET_CC) -shared" \
- LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
- CROSS_COMPILING=yes \
- _python_sysroot=$(STAGING_DIR) \
- _python_srcdir=$(PYTHON_DIR) \
- _python_prefix=/usr \
- _python_exec_prefix=/usr
-
-define PYTHON_CRC16_BUILD_CMDS
- (cd $(@D); $(PYTHON_CRC16_PARAMS) \
- $(HOST_DIR)/usr/bin/python setup.py build)
-endef
-
-define PYTHON_CRC16_INSTALL_TARGET_CMDS
- (cd $(@D); $(PYTHON_CRC16_PARAMS) \
- $(HOST_DIR)/usr/bin/python setup.py install \
- --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-bottle: convert to the Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:34 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=1a60e061622cc4d772ff61f33a3ff1927a3b190c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/python-bottle/python-bottle.mk | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk
index db71512..58c51f9 100644
--- a/package/python-bottle/python-bottle.mk
+++ b/package/python-bottle/python-bottle.mk
@@ -7,16 +7,8 @@
PYTHON_BOTTLE_VERSION = 0.11.6
PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz
PYTHON_BOTTLE_SITE = http://pypi.python.org/packages/source/b/bottle
-PYTHON_BOTTLE_DEPENDENCIES = python
PYTHON_BOTTLE_LICENSE = MIT
# README.rst refers to the file "LICENSE" but it's not included
+PYTHON_BOTTLE_SETUP_TYPE = distutils
-define PYTHON_BOTTLE_BUILD_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py build --executable=/usr/bin/python)
-endef
-
-define PYTHON_BOTTLE_INSTALL_TARGET_CMDS
- (cd $(@D); $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
-endef
-
-$(eval $(generic-package))
+$(eval $(python-package))
^ permalink raw reply related
* [Buildroot] [git commit] package: introduce Python package infrastructure
From: Peter Korsgaard @ 2013-12-15 12:32 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a6bba674a257f291c51a3859381f653e711bd354
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: fix s/BUILD_TYPE/SETUP_TYPE/ typo in manual as noted by Samuel]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
docs/manual/adding-packages-python.txt | 159 +++++++++++++++++++++++
docs/manual/adding-packages.txt | 2 +
package/Makefile.in | 1 +
package/pkg-python.mk | 219 ++++++++++++++++++++++++++++++++
4 files changed, 381 insertions(+), 0 deletions(-)
diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
new file mode 100644
index 0000000..b8d5331
--- /dev/null
+++ b/docs/manual/adding-packages-python.txt
@@ -0,0 +1,159 @@
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
+
+Infrastructure for Python packages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This infrastructure applies to Python packages that use the standard
+Python setuptools mechanism as their build system, generally
+recognizable by the usage of a +setup.py+ script.
+
+[[python-package-tutorial]]
+
++python-package+ tutorial
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+First, let's see how to write a +.mk+ file for a Python package,
+with an example :
+
+------------------------
+01: ################################################################################
+02: #
+03: # python-foo
+04: #
+05: ################################################################################
+06:
+07: PYTHON_FOO_VERSION = 1.0
+08: PYTHON_FOO_SOURCE = python-foo-$(LIBFOO_VERSION).tar.xz
+09: PYTHON_FOO_SITE = http://www.foosoftware.org/download
+10: PYTHON_FOO_LICENSE = BSD-3c
+11: PYTHON_FOO_LICENSE_FILES = LICENSE
+12: PYTHON_FOO_ENV = SOME_VAR=1
+13: PYTHON_FOO_DEPENDENCIES = libmad
+14: PYTHON_FOO_SETUP_TYPE = distutils
+15:
+16: $(eval $(python-package))
+------------------------
+
+On line 7, we declare the version of the package.
+
+On line 8 and 9, we declare the name of the tarball (xz-ed tarball
+recommended) and the location of the tarball on the Web. Buildroot
+will automatically download the tarball from this location.
+
+On line 10 and 11, we give licensing details about the package (its
+license on line 10, and the file containing the license text on line
+11).
+
+On line 12, we tell Buildroot to pass custom options to the Python
++setup.py+ script when it is configuring the package.
+
+On line 13, we declare our dependencies, so that they are built
+before the build process of our package starts.
+
+On line 14, we declare the specific Python build system being used. In
+this case the +distutils+ Python build system is used. The two
+supported ones are +distutils+ and +setuptools+.
+
+Finally, on line 16, we invoke the +python-package+ macro that
+generates all the Makefile rules that actually allow the package to be
+built.
+
+[[python-package-reference]]
+
++python-package+ reference
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+As a policy, packages that merely provide Python modules should all be
+named +python-<something>+ in Buildroot. Other packages that use the
+Python build system, but are not Python modules, can freely choose
+their name (existing examples in Buildroot are +scons+ and
++supervisor+).
+
+In their +Config.in+ file, they should depend on +BR2_PACKAGE_PYTHON+
+so that when Buildroot will enable Python 3 usage for modules, we will
+be able to enable Python modules progressively on Python 3.
+
+The main macro of the Python package infrastructure is
++python-package+. It is similar to the +generic-package+ macro. It is
+also possible to create Python host packages with the
++host-python-package+ macro.
+
+Just like the generic infrastructure, the Python infrastructure works
+by defining a number of variables before calling the +python-package+
+or +host-python-package+ macros.
+
+All the package metadata information variables that exist in the
+xref:generic-package-reference[generic package infrastructure] also
+exist in the Python infrastructure: +PYTHON_FOO_VERSION+,
++PYTHON_FOO_SOURCE+, +PYTHON_FOO_PATCH+, +PYTHON_FOO_SITE+,
++PYTHON_FOO_SUBDIR+, +PYTHON_FOO_DEPENDENCIES+, +PYTHON_FOO_LICENSE+,
++PYTHON_FOO_LICENSE_FILES+, etc.
+
+Note that:
+
+ * Setting +PYTHON_FOO_INSTALL_STAGING+ to +YES+ has no effect (unless
+ a +PYTHON_FOO_INSTALL_STAGING_CMDS+ variable is defined), since
+ Python modules generally don't need to be installed to the
+ +staging+ directory.
+
+ * It is not necessary to add +python+ or +host-python+ in the
+ +PYTHON_FOO_DEPENDENCIES+ variable of a package, since these basic
+ dependencies are automatically added as needed by the Python
+ package infrastructure.
+
+ * Similarly, it is not needed to add +host-setuptools+ and/or
+ +host-distutilscross+ dependencies to +PYTHON_FOO_DEPENDENCIES+ for
+ setuptools-based packages, since these are automatically added by
+ the Python infrastructure as needed.
+
+One variable specific to the Python infrastructure is mandatory:
+
+* +PYTHON_FOO_SETUP_TYPE+, to define which Python build system is used
+ by the package. The two supported values are +distutils+ and
+ +setuptools+. If you don't know which one is used in your package,
+ look at the +setup.py+ file in your package source code, and see
+ whether it imports things from the +distutils+ module or the
+ +setuptools+ module.
+
+A few additional variables, specific to the Python infrastructure, can
+optionally be defined, depending on the package's needs. Many of them
+are only useful in very specific cases, typical packages will
+therefore only use a few of them, or none.
+
+* +PYTHON_FOO_ENV+, to specify additional environment variables to
+ pass to the Python +setup.py+ script (for both the build and install
+ steps). Note that the infrastructure is automatically passing
+ several standard variables, defined in +PKG_PYTHON_DISTUTILS_ENV+
+ (for distutils target packages), +HOST_PKG_PYTHON_DISTUTILS_ENV+
+ (for distutils host packages), +PKG_PYTHON_SETUPTOOLS_ENV+ (for
+ setuptools target packages) and +HOST_PKG_PYTHON_SETUPTOOLS_ENV+
+ (for setuptools host packages).
+
+* +PYTHON_FOO_BUILD_OPT+, to specify additional options to pass to the
+ Python +setup.py+ script during the build step. For target distutils
+ packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
+ passed automatically by the infrastructure.
+
+* +PYTHON_FOO_INSTALL_OPT+, to specify additional options to pass to
+ the Python +setup.py+ script during the installation step. Note that
+ the infrastructure is automatically passing some options, defined in
+ +PKG_PYTHON_DISTUTILS_INSTALL_OPT+ (for target distutils packages),
+ +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT+ (for host distutils
+ packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_OPT+ (for target
+ setuptools packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT+
+ (for host setuptools packages).
+
+With the Python infrastructure, all the steps required to build and
+install the packages are already defined, and they generally work well
+for most Python-based packages. However, when required, it is still
+possible to customize what is done in any particular step:
+
+* By adding a post-operation hook (after extract, patch, configure,
+ build or install). See xref:hooks[] for details.
+
+* By overriding one of the steps. For example, even if the Python
+ infrastructure is used, if the package +.mk+ file defines its own
+ +PYTHON_FOO_BUILD_CMDS+ variable, it will be used instead of the
+ default Python one. However, using this method should be restricted
+ to very specific cases. Do not use it in the general case.
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index ae76e74..01277d8 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -18,6 +18,8 @@ include::adding-packages-autotools.txt[]
include::adding-packages-cmake.txt[]
+include::adding-packages-python.txt[]
+
include::adding-packages-hooks.txt[]
include::adding-packages-gettext.txt[]
diff --git a/package/Makefile.in b/package/Makefile.in
index 7bc0606..f5d6289 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -371,4 +371,5 @@ include package/pkg-utils.mk
include package/pkg-download.mk
include package/pkg-autotools.mk
include package/pkg-cmake.mk
+include package/pkg-python.mk
include package/pkg-generic.mk
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
new file mode 100644
index 0000000..e436f22
--- /dev/null
+++ b/package/pkg-python.mk
@@ -0,0 +1,219 @@
+################################################################################
+# Python package infrastructure
+#
+# This file implements an infrastructure that eases development of
+# package .mk files for Python packages. It should be used for all
+# packages that use Python setup.py/setuptools as their build system.
+#
+# See the Buildroot documentation for details on the usage of this
+# infrastructure
+#
+# In terms of implementation, this Python infrastructure requires the
+# .mk file to only specify metadata informations about the package:
+# name, version, download URL, etc.
+#
+# We still allow the package .mk file to override what the different
+# steps are doing, if needed. For example, if <PKG>_BUILD_CMDS is
+# already defined, it is used as the list of commands to perform to
+# build the package, instead of the default Python behaviour. The
+# package can also define some post operation hooks.
+#
+################################################################################
+
+# Target distutils-based packages
+PKG_PYTHON_DISTUTILS_ENV = \
+ PATH="$(TARGET_PATH)" \
+ CC="$(TARGET_CC)" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ LDSHARED="$(TARGET_CROSS)gcc -shared" \
+ CROSS_COMPILING=yes \
+ _python_sysroot=$(STAGING_DIR) \
+ _python_srcdir=$(PYTHON_DIR) \
+ _python_prefix=/usr \
+ _python_exec_prefix=/usr
+
+PKG_PYTHON_DISTUTILS_BUILD_OPT = \
+ --executable=/usr/bin/python
+
+PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
+ --prefix=$(TARGET_DIR)/usr
+
+# Host distutils-based packages
+HOST_PKG_PYTHON_DISTUTILS_ENV = \
+ PATH="$(HOST_PATH)"
+
+HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
+ --prefix=$(HOST_DIR)/usr
+
+# Target setuptools-based packages
+PKG_PYTHON_SETUPTOOLS_ENV = \
+ PATH="$(TARGET_PATH)" \
+ PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
+ PYTHONXCPREFIX="$(STAGING_DIR)/usr/"
+
+PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
+ --prefix=$(TARGET_DIR)/usr \
+ --executable=/usr/bin/python \
+ --single-version-externally-managed \
+ --root=/
+
+# Host setuptools-based packages
+HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
+ PATH="$(HOST_PATH)" \
+ PYTHONXCPREFIX="$(HOST_DIR)/usr/"
+
+HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
+ --prefix=$(HOST_DIR)/usr
+
+################################################################################
+# inner-python-package -- defines how the configuration, compilation
+# and installation of a Python package should be done, implements a
+# few hooks to tune the build process and calls the generic package
+# infrastructure to generate the necessary make targets
+#
+# argument 1 is the lowercase package name
+# argument 2 is the uppercase package name, including an HOST_ prefix
+# for host packages
+# argument 3 is the uppercase package name, without the HOST_ prefix
+# for host packages
+# argument 4 is the package directory prefix
+# argument 5 is the type (target or host)
+################################################################################
+
+define inner-python-package
+
+$(2)_SRCDIR = $$($(2)_DIR)/$($(2)_SUBDIR)
+$(2)_BUILDDIR = $$($(2)_SRCDIR)
+
+$(2)_ENV ?=
+$(2)_BUILD_OPT ?=
+$(2)_INSTALL_OPT ?=
+
+ifndef $(2)_SETUP_TYPE
+ ifdef $(3)_SETUP_TYPE
+ $(2)_SETUP_TYPE = $($(3)_SETUP_TYPE)
+ else
+ $$(error "$(1): Unknown or undefined <pkg>_SETUP_TYPE")
+ endif
+endif
+
+# Distutils
+ifeq ($$($(2)_SETUP_TYPE),distutils)
+ifeq ($(5),target)
+$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
+$(2)_BASE_BUILD_TGT = build
+$(2)_BASE_BUILD_OPT = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
+$(2)_BASE_INSTALL_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_OPT)
+else
+$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
+$(2)_BASE_BUILD_TGT = build
+$(2)_BASE_BUILD_OPT =
+$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT)
+endif
+# Setuptools
+else ifeq ($$($(2)_SETUP_TYPE),setuptools)
+ifeq ($(5),target)
+$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
+$(2)_BASE_BUILD_TGT = build -x
+$(2)_BASE_BUILD_OPT =
+$(2)_BASE_INSTALL_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_OPT)
+else
+$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
+$(2)_BASE_BUILD_TGT = build
+$(2)_BASE_BUILD_OPT =
+$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT)
+endif
+endif
+
+# The below statement intends to calculate the dependencies of host
+# packages by derivating them from the dependencies of the
+# corresponding target package, after adding the 'host-' prefix in
+# front of the dependencies.
+#
+# However it must be repeated from inner-generic-package, as we need
+# to exclude the python, host-python, host-python-setuptools and
+# host-distutilscross packages, which are added below in the list of
+# dependencies depending on the package characteristics, and shouldn't
+# be derived automatically from the dependencies of the corresponding
+# target package. For example, target packages need
+# host-python-distutilscross, but not host packages.
+$(2)_DEPENDENCIES ?= $(filter-out host-python host-python-setuptools host-python-distutilscross $(1),$(patsubst host-host-%,host-%,$(addprefix host-,$($(3)_DEPENDENCIES))))
+
+# Target packages need both the python interpreter on the target (for
+# runtime) and the python interpreter on the host (for
+# compilation). However, host packages only need the python
+# interpreter on the host.
+ifeq ($(5),target)
+$(2)_DEPENDENCIES += host-python python
+else
+$(2)_DEPENDENCIES += host-python
+endif
+
+# Setuptools based packages will need host-python-setuptools (both
+# host and target) and host-python-distutilscross (only target
+# packages). We need to have a special exclusion for the
+# host-setuptools package itself: it is setuptools-based, but
+# shouldn't depend on host-setuptools (because it would otherwise
+# depend on itself!).
+ifeq ($$($(2)_SETUP_TYPE),setuptools)
+ifneq ($(2),HOST_PYTHON_SETUPTOOLS)
+$(2)_DEPENDENCIES += host-python-setuptools
+ifeq ($(5),target)
+$(2)_DEPENDENCIES += host-python-distutilscross
+endif
+endif
+endif
+
+#
+# Build step. Only define it if not already defined by the package .mk
+# file.
+#
+ifndef $(2)_BUILD_CMDS
+define $(2)_BUILD_CMDS
+ (cd $$($$(PKG)_BUILDDIR)/; \
+ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
+ $(HOST_DIR)/usr/bin/python setup.py \
+ $$($$(PKG)_BASE_BUILD_TGT) \
+ $$($$(PKG)_BASE_BUILD_OPT) $$($$(PKG)_BUILD_OPT))
+endef
+endif
+
+#
+# Host installation step. Only define it if not already defined by the
+# package .mk file.
+#
+ifndef $(2)_INSTALL_CMDS
+define $(2)_INSTALL_CMDS
+ (cd $$($$(PKG)_BUILDDIR)/; \
+ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
+ $(HOST_DIR)/usr/bin/python setup.py install \
+ $$($$(PKG)_BASE_INSTALL_OPT) $$($$(PKG)_INSTALL_OPT))
+endef
+endif
+
+#
+# Target installation step. Only define it if not already defined by
+# the package .mk file.
+#
+ifndef $(2)_INSTALL_TARGET_CMDS
+define $(2)_INSTALL_TARGET_CMDS
+ (cd $$($$(PKG)_BUILDDIR)/; \
+ $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
+ $(HOST_DIR)/usr/bin/python setup.py install \
+ $$($$(PKG)_BASE_INSTALL_OPT) $$($$(PKG)_INSTALL_OPT))
+endef
+endif
+
+# Call the generic package infrastructure to generate the necessary
+# make targets
+$(call inner-generic-package,$(1),$(2),$(3),$(4),$(5))
+
+endef
+
+################################################################################
+# python-package -- the target generator macro for Python packages
+################################################################################
+
+python-package = $(call inner-python-package,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target)
+host-python-package = $(call inner-python-package,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host)
^ permalink raw reply related
* [Buildroot] [PATCHv2] php: bump to version 5.5.7
From: Gustavo Zacarias @ 2013-12-15 12:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
v2:
Add !IPv6 comment for sockets support.
This is now a security bump for CVE-2013-4073 & CVE-2013-6420.
package/php/Config.ext | 17 ++++++-----------
package/php/php.mk | 14 ++------------
2 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/package/php/Config.ext b/package/php/Config.ext
index 23d2306..2ffa2c2 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -91,17 +91,6 @@ config BR2_PACKAGE_PHP_EXT_DBA_INI
endif
-config BR2_PACKAGE_PHP_EXT_SQLITE
- bool "SQLite"
- help
- Legacy SQLite2 support
-
-config BR2_PACKAGE_PHP_EXT_SQLITE_UTF8
- bool "sqlite UTF8 support"
- depends on BR2_PACKAGE_PHP_EXT_SQLITE
- help
- UTF8 support for sqlite
-
config BR2_PACKAGE_PHP_EXT_MYSQL
bool "Mysql"
depends on BR2_INSTALL_LIBSTDCPP
@@ -227,6 +216,7 @@ config BR2_PACKAGE_PHP_EXT_FTP
config BR2_PACKAGE_PHP_EXT_SNMP
bool "SNMP"
+ depends on BR2_USE_MMU # netsnmp fork()
select BR2_PACKAGE_NETSNMP
select BR2_PACKAGE_NETSNMP_ENABLE_MIBS
help
@@ -234,13 +224,18 @@ config BR2_PACKAGE_PHP_EXT_SNMP
config BR2_PACKAGE_PHP_EXT_SOCKETS
bool "sockets"
+ depends on BR2_INET_IPV6
help
Sockets support
+comment "sockets support needs a toolchain w/ IPv6"
+ depends on !BR2_INET_IPV6
+
comment "Process Control"
config BR2_PACKAGE_PHP_EXT_PCNTL
bool "PCNTL"
+ depends on BR2_USE_MMU # fork()
help
Process control support
diff --git a/package/php/php.mk b/package/php/php.mk
index 3e284f2..8b4a727 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -4,12 +4,13 @@
#
################################################################################
-PHP_VERSION = 5.3.27
+PHP_VERSION = 5.5.6
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_SITE = http://www.php.net/distributions
PHP_INSTALL_STAGING = YES
PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
+PHP_DEPENDENCIES = host-pkgconf
PHP_LICENSE = PHP
PHP_LICENSE_FILES = LICENSE
PHP_CONF_OPT = --mandir=/usr/share/man \
@@ -125,17 +126,6 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
PHP_DEPENDENCIES += readline
endif
-### Legacy sqlite2 support
-ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
- PHP_CONF_OPT += --with-sqlite
-ifneq ($(BR2_LARGEFILE),y)
- PHP_CFLAGS += -DSQLITE_DISABLE_LFS
-endif
-ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
- PHP_CONF_OPT += --enable-sqlite-utf8
-endif
-endif
-
### Native MySQL extensions
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y)
PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
--
1.8.3.2
^ permalink raw reply related
* [Buildroot] [PATCH 2 of 2] manual: clarify format of comments about dependency on Linux kernel
From: Thomas De Schampheleire @ 2013-12-15 12:20 UTC (permalink / raw)
To: buildroot
In-Reply-To: <patchbomb.1387110038@argentina>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
docs/manual/adding-packages-directory.txt | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -253,6 +253,22 @@ use in the comment.
** Dependency symbol: +!BR2_PREFER_STATIC_LIB+
** Comment string: +dynamic library+
+Dependencies on a Linux kernel built by buildroot
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Some packages need a Linux kernel to be built by buildroot. These are
+typically kernel modules or firmware. A comment should be added in the
+Config.in file to express this dependency, similar to dependencies on
+toolchain options. The general format is:
+
+--------------------------
+foo needs a Linux kernel to be built
+--------------------------
+
+If there is a dependency on both toolchain options and the Linux
+kernel, use this format:
+--------------------------
+foo needs a toolchain w/ featA, featB, featC and a Linux kernel to be built
+--------------------------
The +.mk+ file
~~~~~~~~~~~~~~
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox