So that it can be included twice.
python-package.mk include python-host.mk, but at some point
in time python-host.mk is not exported to staging_dir yet.
So, to have in python's Makefile, we need to include it
in the Makefile, and to prevent double inclusion (if
python-host.mk is exported from a previous build), the
include guard is added.
Also, moved the includes after some vars were set.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Currently, the python3-package.mk framework relies on HOST_BUILD_PREFIX to
refer to the $(STAGING_DIR)/host directory but using the HOST_BUILD_PREFIX
variable requires the use of include/host-build.mk which in turn includes
python3-package.mk, leading to target redefinition errors.
In order to provide a global, uniform way to refer to the host staging
directory, LEDE introduced a new variable STAGING_DIR_HOSTPKG which points
to $(STAGING_DIR)/host for now with the purpose of eventually being able to
relocate that directory in the future.
This commit changes python3-package.mk to ...
- stop including include/host-build.mk (revert of #3423)
- replace usages of $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)
- warn and fallback to $(STAGING_DIR)/host if STAGING_DIR_HOSTPKG is
unavailable
The fallback code will ensure that the python host build infrastructure
continues to work properly on older OpenWrt and LEDE versions until the
STAGING_DIR_HOSTPKG is fully settled in and can be removed some time
in the future.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Currently, the python-host.mk framework relies on HOST_BUILD_PREFIX to
refer to the $(STAGING_DIR)/host directory but using the HOST_BUILD_PREFIX
variable requires the use of include/host-build.mk which in turn includes
python-host.mk, leading to target redefinition errors.
In order to provide a global, uniform way to refer to the host staging
directory, LEDE introduced a new variable STAGING_DIR_HOSTPKG which points
to $(STAGING_DIR)/host for now with the purpose of eventually being able to
relocate that directory in the future.
This commit changes python-host.mk to ...
- stop including include/host-build.mk (revert of #3423)
- replace usages of $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)
- warn and fallback to $(STAGING_DIR)/host if STAGING_DIR_HOSTPKG is
unavailable
The fallback code will ensure that the python host build infrastructure
continues to work properly on older OpenWrt and LEDE versions until the
STAGING_DIR_HOSTPKG is fully settled in and can be removed some time
in the future.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Remove the php5 stuff since php7 is in place for several weeks
and all depended in-tree packages has been migrated.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Add a Lua wrapper library for openssl.
Add patches for:
1. Revise the makefile, so the package can be built under openwrt
2. Remove "lua_isinteger" implementation from the package's "compat"
code in order to avoid linkage issues - An implementation already
exists in the target's Lua package.
3. Support OPENSSL_NO_SSL3_METHOD & OPENSSL_NO_COMP
Signed-off-by: Amnon Paz <pazamnon@gmail.com>
Old keplerproject.org urls are all down.
github project source for this project references new githubio website.
Signed-off-by: Karl Palsson <karlp@etactica.com>
This fixes the following CVEs:
- in intl: CVE-2016-7416
- in mysqlnd: CVE-2016-7412
- in phar: CVE-2016-7414
- in spl: CVE-2016-7417
- in standard: CVS-2016-7411
- in wddx: CVE-2016-7413, CVE-2016-7418
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
This fixes the following CVEs:
- in intl: CVE-2016-7416
- in mysqlnd: CVE-2016-7412
- in phar: CVE-2016-7414
- in spl: CVE-2016-7417
- in wddx: CVE-2016-7413, CVE-2016-7418
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
It's a bit weird fixing a build error with an upgrade,
but it seems to work on my setup.
Hopefully, builbot agrees.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
When php is installed on the host system, then the configure tries
to obtain from this binary whether some extensions are available.
This prevents the cross build when the desired extensions are not
present - which is the usual case.
So add a patch to prevent configure from doing this - we give
this information via environment variable during build already.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
- remove hack to find required packages: when php5-pecl-{raphf,propro}
was built in paralle, then the hack could not determine which build
directory must be used; this was resolved by a previous commit, both
packages now install their header files in the staging area so that
this pecl module will find it properly
- refine build dir to avoid collision with (possible) php5 package variant
Signed-off-by: Michael Heimpold <mhei@heimpold.de>