Commit graph

1188 commits

Author SHA1 Message Date
Alexandru Ardelean
1c54e2b0fb python,python3: fix underlinking issues with lrt (clock_gettime())
Seems it's called underlinking that's happening only
on Ubuntu 12.04 with libressl (that comes from LEDE's
tools folder).

Link here:
https://ubuntuforums.org/showthread.php?t=1870586

I'm still reading about this a bit.
Since I don't really get it.

But applying that fix (as in the link) seems to fix compiling
on Ubuntu 12.04, and tried also on 16.04 (to make sure).

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-07-03 09:28:41 +03:00
Daniel Golle
1aca235d44
python-pyodbc: add package
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-07-01 19:46:55 +02:00
Alexandru Ardelean
e88e35249f python,python3: install mk files in the Host/Install phase
The Build/InstallDev rule is activated only for target builds.
But if someone needs only the host Python, then
these files need to be installed in this phase, and not Build/InstallDev

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-06-29 14:04:09 +03:00
Alexandru Ardelean
7a79f2db79 python-six: rename PKG_NAME to python-six, and adapt unpack cmd for build
OVS has PKG_BUILD_DEPENDS:=python-six/host as dep.
But that doesn't seem to work, since the PKG_NAME:=six

So, this change renames the PKG_NAME to python-six, to
make it clear it's Python package.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-06-29 13:48:42 +03:00
Michael Heimpold
c258748126 Merge pull request #4485 from pprindeville/php7-enable-snmp
php7: add SNMP module to bundle
2017-06-22 11:57:46 +02:00
Hannu Nyman
b23a5435a6 Merge pull request #4429 from sdwalker/cleanup
packages: cleanup Makefile variables
2017-06-17 09:25:22 +03:00
Philip Prindeville
ec58befa8e php7: add SNMP module to bundle
Add native support for SNMP manager functions, so scripts don't
have to call system("snmpget -v2c ...") etc.  Cuts down on fork/exec
pairs and simplifies issues with parsing intermediate output.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-06-16 19:53:53 -06:00
Alexandru Ardelean
576c45eb0a python3: fix distutils path to package when using bytecodes
If there is only Python bytecodes, then
the __init__.py script will be concatenated, and
the __init__.pyc as well.

This is becase this bit `path = os.path.join(path, '__init__'+extension)`
is iterated twice.

This is a bug in Python3, also because we ship bytecodes
instead of source code [ with Python & Python3 ].
Python is not affected.

Reported-by: Mirko Vogt <mirko@nanl.de>
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-06-12 23:26:54 +03:00
Michael Heimpold
d6c333b705 php7: update to 7.1.6
Removed patch 1008-fix-musl-sys-headers.patch which was integrated
upstream.

(Compile tested only so far)

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-06-10 15:06:53 +02:00
Florian Fainelli
140b3f2fe0 lpeg: Fix build with external toolchains
We are not properly passing down TARGET_CFLAGS and TARGET_CPPFLAGS and
this can be noticed with external toolchains with the following build
error:

mipsel-linux-gnu-gcc -Wall -Wextra -pedantic -Waggregate-return
-Wcast-align -Wcast-qual -Wdisabled-optimization -Wpointer-arith
-Wshadow -Wsign-compare -Wundef -Wwrite-strings -Wbad-function-cast
-Wdeclaration-after-statement -Wmissing-prototypes -Wnested-externs
-Wstrict-prototypes  -O2 -std=c99 -I../lua/ -fPIC   -c -o lpvm.o lpvm.c
lpvm.c:10:17: fatal error: lua.h: No such file or directory
 #include "lua.h"
                 ^
compilation terminated.
make[4]: *** [lpvm.o] Error 1

Re-use COPT to pass our TARGET_CFLAGS and TARGET_CPPFLAGS

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
2017-06-05 17:44:27 -07:00
Alexandru Ardelean
ff016a4802 python-lxml: add initial version (with python3 variant included)
This package requires libxml2 & libxslt to be built, has some
C code so it's not installable via pip.
It needs cross-compilation.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-06-05 18:00:24 +03:00
Michael Heimpold
fe125bd55f php7-pecl-http: add a patch to fix a segfault during php startup
The extensions tries to register some string constants after quering
version strings from underlaying libcurl. However, depending on libcurl's
configuration these strings could also be NULL, which was not handled
properly.

An upstream pull request for this patch is waiting for review.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-06-04 21:34:40 +02:00
Stephen Walker
b63a809213 packages: cleanup Makefile variables
Standard assignment is immediate expansion without any extraneous spacing, RFC822 compliant email addresses and consistent section assignments

Signed-off-by: Stephen Walker <stephendwalker+github@gmail.com>
2017-06-03 16:38:06 -04:00
Alexandru Ardelean
c9337b2b92 python-six: add host-side build
Needed for Open vSwitch's python libs.
And build.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-05-24 23:07:05 +03:00
Alexandru Ardelean
0d54d05b6d python3-pip: override Package/python3-pip/install rule
This is in essence fixes pip3.

That means pip3 will ship without Python byte-codes
for a while, until I'll find a better way to fix it.

I couldn't think of a not-very hack-ish way of doing it.

The only draw-back of this, will be that pip3 will run
a bit slower ; but that should be ok for a while.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-05-19 17:28:08 +03:00
Alexandru Ardelean
a4691a289c python3: remove __pycache__ folders pip & setuptools
python3-pip & python3-setuptools have slightly
different installation mechanisms.

We need to remove the __pycache__ folders.
Seems they're generated.

This also reduces the size of the python3-pip &
python3-setuptools packages.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-05-19 17:27:48 +03:00
Alexandru Ardelean
b9d88065f5 python,python3: allow python packages to override Package/<pkg>/install rule
Python packages try to enforce their own.
For some cases this may not be desired.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-05-19 17:16:39 +03:00
Alexandru Ardelean
68312f49c0 python packages: move all things python under lang/python
I admit this may be be a bit aggressive, but the lang
folder is getting cluttered/filled up with Python, PHP, Perl,
Ruby, etc. packages.

Makes sense to try to group them into per-lang folders.

I took the Pythons.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-05-17 16:51:14 +03:00
Michael Heimpold
b7eb92aada php7: update to 7.1.5
Remove patch 1006-fix-gettext.patch which was integrated upstream.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-05-14 22:31:25 +02:00
Michail Frolov
571a810fd4 lang/perl: Upgraded to Perl 5.24.1
Signed-off-by: Michail Frolov <frolovm@pobox.com>
2017-05-10 14:46:25 -04:00
Hannu Nyman
74e53c4842 lua-bencode: download .tar.gz instead of using hg
Avoid using 'hg' (Mercurial) to download sources.

'hg' is not an official prerequisite and it is not installed
in all buildslaves in Openwrt and LEDE buildbots, which
leads to frequent build failures.

Download the .tar.gz source archive instead.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2017-04-18 23:33:47 +03:00
Michael Heimpold
12e3019db7 php7: use TARGET_CXXFLAGS instead of TARGET_CPPFLAGS for C++ option
This fixes a stupid typo from last commit which lead to the following
compiler warning:

cc1: warning: command line option '-std=c++11' is valid for C++/ObjC++ but not for C

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-18 21:38:37 +02:00
Michael Heimpold
4dd144c1bd php7: fix build of php7-mod-intl
This fixes the following build error (shortened paths for readability):

-snip-
In file included from .../php-7.1.4/ext/intl/intl_convertcpp.h:26:0,
                 from .../php-7.1.4/ext/intl/intl_convertcpp.cpp:21:
.../staging_dir/target-arm_arm926ej-s_musl_eabi/usr/include/unicode/unistr.h:56:16: error: 'UChar' does not name a type
 u_strlen(const UChar *s);
                ^
.../staging_dir/target-arm_arm926ej-s_musl_eabi/usr/include/unicode/unistr.h:80:19: error: 'char16_t' has not been declared
                   char16_t *dest, int32_t destCapacity,
                   ^
.../staging_dir/target-arm_arm926ej-s_musl_eabi/usr/include/unicode/unistr.h:81:25: error: 'char16_t' does not name a type
                   const char16_t *src, int32_t srcLength,
                         ^
In file included from .../php-7.1.4/ext/intl/intl_convertcpp.h:26:0,
                 from .../php-7.1.4/ext/intl/intl_convertcpp.cpp:21:
.../staging_dir/target-arm_arm926ej-s_musl_eabi/usr/include/unicode/unistr.h:462:16: error: 'char16_t' does not name a type
          const char16_t *srcChars) const;
                ^
[...]
-snap-

This build error was introduced by update of icu to 59.1.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-18 00:12:28 +02:00
Philip Prindeville
c401946b0e php7: fix php build issues with musl headers (fixes #4263)
MUSL is complaining about <sys/poll.h> instead of <poll.h>.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

[ Replaced the *-t1lib filtering stuff by simply removing the
left-over configure option ]

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-17 21:58:32 +02:00
Michael Heimpold
4100706817 php7: enable filter support by default (fixes #3831)
Filter support brings several useful features which many PHP applications
rely on. To make it easier for users who don't want to build own packages
enable this by default. This slightly increases the binary SAPI packages,
but since PHP is a huge monster anyway, I doubt this hurts anybody.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-13 23:04:22 +02:00
Michael Heimpold
11dbb67426 php7: update to 7.1.4
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-13 23:04:22 +02:00
Michael Heimpold
cf75d8a0f9 php7: fix bind_textdomain_codeset detection (refs #4250)
The gettext extension is only useful when linked against libintl-full
package, however, the detection did not work sucessfully. This patch
by @Dimazhan fixes this.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-04-11 23:31:37 +02:00
Philip Prindeville
675be0798a perl-cgi: Update to 4.36
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-04-09 23:02:54 -06:00
Ygal Blum
18e816d5fd node: Move NPM into a separated pacakge
In order to reduce flash requirements and also to disallow running NPM on the target
move NPM out of the default NodeJS package.
In order to allow adding NPM via opkg install, move it to a separated
directory

Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
2017-04-06 10:15:32 +03:00
Luiz Angelo Daros de Luca
e66e7d35bc ruby: change source to .xz
It will save about 2M of download. Thanks @diizzyy.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2017-03-27 23:05:49 -03:00
Michael Heimpold
d235263b94 php7-pecl-dio: upgrade to 0.1.0
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-03-27 21:44:58 +02:00
Michael Heimpold
5b2a6b921f php7-pecl-http: remove left-over backup directory
This directory was added by mistake in one of the last commits to
this package, just remove it, it's not needed.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-03-27 21:44:51 +02:00
Alexandru Ardelean
39680db273 python3: upgrade to version 3.6.1
Dropped patch `002-do-not-add-include-dirs-when-cross-compiling.patch`
Seems upstream also fixed it (yay).

Refreshed patch `011-fix-ncursesw-definition-colisions.patch`

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-27 11:44:15 +03:00
Luiz Angelo Daros de Luca
26d19b5cb1 ruby: bump to 2.4.1
This releases contains only bug and security fixes,
mostly backported from devel branch.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2017-03-23 00:40:46 -03:00
Michael Heimpold
1fa7ca0f48 php7: update to 7.1.3
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-03-20 21:34:37 +01:00
Alexandru Ardelean
9f7235e42a python,python3: bump PKG_RELEASEs
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 18:43:50 +02:00
Alexandru Ardelean
ae350d9387 python3: split source packages away from compiled packages
Same as for python.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 18:43:47 +02:00
Alexandru Ardelean
20685f5220 python: split source packages away from compiled packages
Well, they're not yet compiled, but in the next commit
they should be.

People have been complaining [citation needed] to me
via email or via Github that Python's performance is crap
because it packages sources directly and they're not compiled.
And Python has to compile the sources on each run, and
on-the-fly.

Allowing compilation caching is also a no-no, because
I'll get complaints that the flash storage fills up
whenever a Python app runs.

So, to give the user a choice, the new de-facto packaging
for Python packages will be:
* ship compiled + [ preferably ] optimized files
* package sources separately

The problem is that this doubles the number of packages
in LEDE/OpenWrt, but build-times should not suffer a big
hit, since the compilation is done once, and the
install phase should not be too intensive.

Oh, and people don't need ship source packages if
they don't want to.
To do that, a packager needs to just call
`$(eval $(call BuildPackage,python-<package>-src))`

The `python-` prefix is important.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 18:43:41 +02:00
Alexandru Ardelean
05f8d6edf0 python,python3: drop remove .pyc & .pyo files
We'll control in the install phase what we ship [byte-codes or source files]

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 09:26:36 +02:00
Alexandru Ardelean
92073b047b python,python3: drop tests from all core packages
Well, this slipped by for some time.
This should make the Python core packages even more lighter.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 09:23:10 +02:00
Alexandru Ardelean
a85b0b6b57 python3: make sure $(1)/usr/lib path exists for python3-dev package
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 09:23:10 +02:00
Alexandru Ardelean
6c4dcf4446 python: fix python-dev clash with python-base
Both want to install libpython.so.
python-dev should install libpython.a

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 09:23:10 +02:00
Alexandru Ardelean
df0d0bcc00 python,python3: move PyPackage install rules in the beggining of the Package install rules
So that we can process Python sources installed
by those rules, if we need to.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 09:23:10 +02:00
Alexandru Ardelean
5d502e8530 python3: move filespec shell code into file
Same as for python.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 09:23:10 +02:00
Alexandru Ardelean
06c91a7ed8 python: move filespec shell code into file
Cleanup.
And preparation for adding a bit more functionality.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 09:23:10 +02:00
Alexandru Ardelean
17da988645 python,python3: fix goof with multiline command break
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-03-09 09:23:10 +02:00
Stijn Tintel
f82287cf5c treewide: use name in define and eval lines
For consistency, use full name instead of $(PKG_NAME) in define and eval
lines for all packages.

I've seen reviews that asked to do this before, and I am asking the same
during reviews now. To avoid this in the future, fix this treewide so
when people use existing packages as example, we will not have to
request this change anymore.

This makes all packages consistent with both LEDE and OpenWrt base
repositories.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2017-03-08 21:15:20 +01:00
Hannu Nyman
e6b3b33163 Merge pull request #4074 from commodo/python-cryptografix-fix
python-cryptography: fix build by disabling setup requirements
2017-03-06 09:59:18 +02:00
Alexandru Ardelean
274cacf365 python-cryptography: fix build by disabling setup requirements
python-cryptography tries to install other packages during setup.

However, this isn't needed, since they should have been already
resolved/installed via LEDE/OpenWrt's build system dep logic.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-02-26 12:38:21 +02:00
Michael Heimpold
549d470b99 php7: update to 7.1.2
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-02-24 18:10:02 +01:00
Hannu Nyman
4bceecac96 Merge pull request #3967 from commodo/python-pyscopg2
python-psycopg2: replace python-setuptools dep with python/host
2017-02-22 00:20:49 +02:00
Hannu Nyman
557485abfc Merge pull request #4039 from the-alien/master
python-ldap: update to 2.4.32
2017-02-19 23:35:19 +02:00
alien
1fbc57b6d4 python-ldap: update to 2.4.32
Signed-off-by: Dmitry Trefilov <the-alien@live.ru>
2017-02-19 22:41:18 +03:00
Hannu Nyman
9c176d0b35 Merge pull request #3860 from commodo/micropython-lib-workaround
micropython-lib: workaround the `install` build rule
2017-02-17 10:03:04 +02:00
Morteza Milani
927ca1346d luv: new package
Luv is libuv binding for lua.

Signed-off-by: Morteza Milani <milani@pichak.co>
2017-02-16 13:21:13 +00:00
Hannu Nyman
99a3b34db3 Merge pull request #3784 from diizzyy/patch-16
lang/python3-bottle: Update to 0.12.12
2017-02-15 16:52:23 +02:00
Hannu Nyman
f20e7ec2ea Merge pull request #4001 from kissg1988/seafile
seafile: update to version 6.0.7
2017-02-14 09:27:37 +02:00
Gergely Kiss
1534aca7f2 seafile: update to version 6.0.7
Update several dependencies, as well:

* django-compressor -> 2.1.1
* django-constance -> 1.3.4
* django-restframework -> 3.5.4
* django-statici18n -> 1.3.0
* django -> 1.8.17
* openpyxl -> 2.4.2
* python-dateutil -> 2.6.0
* python-urllib3 -> 1.20

Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2017-02-13 22:03:14 +01:00
Hannu Nyman
cc5f005e4f Merge pull request #3998 from commodo/fix-ncurses-build
python,python3: fix ncurses module build
2017-02-13 18:40:06 +02:00
Alexandru Ardelean
5d53a642db python3: fix ncursesw definition collisions
setup.py seems to add the host's /usr/include/ncursesw
header.

Reported-by: Arturo Rinaldi <arturo@arduino.org>
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-02-13 18:30:57 +02:00
Alexandru Ardelean
6bfd17e75c python: remove setupterm() redefinition
It's not 100% aligned with the ncurses' definition.

Reported-by: Arturo Rinaldi <arturo@arduino.org>
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-02-13 18:30:29 +02:00
alien
5358517f01 python-ldap: update to 2.4.30
Signed-off-by: Dmitry Trefilov <the-alien@live.ru>
2017-02-13 03:04:23 +03:00
Alexandru Ardelean
4772aec581 python,python3: override python setuptools & pip versions
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-02-09 16:31:16 +02:00
Alexandru Ardelean
f45184b054 python-pyscopg2: replace python-setuptools dep with python/host
After removing python-setuptools package, the dependency
chain to python/host is a bit different.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-02-07 12:12:14 +02:00
Hannu Nyman
6ad63bd6d7 Merge pull request #3943 from commodo/python3-cffi
python3-cffi: add variant
2017-02-03 16:58:02 +02:00
Andrew McConachie
d6d80ba540 lang/python-pcapy: Bumped version to 0.11.1
Signed-off-by: Andrew McConachie <andrew@depht.com>
Compile tested: AMD64
Run tested: tested
Description: new release
2017-02-01 13:45:50 -05:00
Alexandru Ardelean
ec52bf32ed python-cffi: add python3 variant
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-02-01 11:56:14 +02:00
Alexandru Ardelean
ae7461269d python-pycparser: add python3 variant
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-02-01 11:55:05 +02:00
Alexandru Ardelean
bb156c4919 python-ply: add python3 variant
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-02-01 11:51:30 +02:00
Alexandru Ardelean
f87c83c358 python-packages: remove python-pip/host dependency
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-26 13:53:28 +02:00
Alexandru Ardelean
d10fad7c21 python-dns: remove python-setuptools/host dependency
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-26 13:53:28 +02:00
Michael Heimpold
97df69951c php7: update to 7.1.1
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-01-24 21:39:59 +01:00
Matthias Schiffer
919c24c598
php7: fix xml2-config path to unbreak build
Partially reverts 4a984a8d6. Fixes #3907.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2017-01-24 12:45:03 +01:00
Hannu Nyman
8e83bb28f1 Merge pull request #3897 from commodo/python-unify
python,python3,pip,setuptools: unify pip & setuptools under python,python3
2017-01-24 07:40:36 +02:00
Alexandru Ardelean
31d614f92c python,python3: add python-pip-conf package to be used by both python-pip & python3-pip
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-23 11:59:50 +02:00
Alexandru Ardelean
a53d0c5a40 pip,setuptools: move as part of python,python3 build
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-23 10:20:20 +02:00
Hannu Nyman
52889e647f Merge pull request #3861 from milani/luajit
luajit: update to trunk
2017-01-23 09:34:55 +02:00
Morteza Milani
67c549fd06 luajit: update to trunk
This includes a fix in jit module that is essential for MIPS target.

Signed-off-by: Morteza Milani <milani@pichak.co>
2017-01-23 11:00:53 +03:30
Alexandru Ardelean
80349f9e73 python,python3: install built-in pip and setuptools
Easier than using external package.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-23 09:06:51 +02:00
Alexandru Ardelean
ed8fa163c0 python3: sync changes from python
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-19 18:15:12 +02:00
Jo-Philipp Wich
20ee2c902a perl-www-curl: fix build against curl >= 7.50
Import a proposed upstream bug fix to allow building against recent curl
versions. Fixes the following error observed by the buildbots:

    curlopt-constants.c:129:49: error: 'CURL_STRICTER' undeclared (first use in this function)
                 if (strEQ(name, "STRICTER")) return CURL_STRICTER;

Upstream bug: https://rt.cpan.org/Public/Bug/Display.html?id=117793

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2017-01-18 03:44:18 +01:00
Luiz Angelo Daros de Luca
d549a9a343 ruby: derive ABI version from VERSION
There might be no ABI breakage when the first two number
of version are the same.

(No change on generated packages. No need to bumb release)

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2017-01-17 23:05:18 -02:00
Alexandru Ardelean
a5b9cc6a24 micropython-lib: workaround the install build rule
So, I chose to workaround it in the Makefile.
A proper fix is a bit more work that I would like to do now,
and I have no suggestion/idea for a good fix right now.

The problem is with the `CMD` part that's used in the install rule,
together with the fact that PREFIX is the same as the source location.

```
CMD="find . -maxdepth 1 -mindepth 1 \( -name '*.py' -not -name 'test_*' -not -name 'setup.py' \) -or \( -type d -not -name 'dist' -not -name '*.egg-info' -not -name '__pycache__' \)| xargs --no-run-if-empty cp -r -t $(PREFIX)"
```

The gist of it, is that it seems that this will filter
and copy to `PREFIX` all python sources and folders that
are not names `dist`, `__pycache__`, or `*.egg-info`.
And it searches all folders at (exactly) depth 1.

The solution I chose is to put a `dist` folder under
`_install_tmp`, which is kind of a trick to go
to depth 2 and avoid both conditions in the `find` call.

This avoids errors:
```
cp: './weakref.py' and '/home/sandu/work/lede/build_dir/target-mips_24kc_musl-1.1.16/micropython-lib-1.8.6-f81e979c56dddb771ad36ec381b7f2c6cd12111f-f81e979c56dddb771ad36ec381b7f2c6cd12111f/_install_tmp/weakref.py' are the same file
cp: './xmltok.py' and '/home/sandu/work/lede/build_dir/target-mips_24kc_musl-1.1.16/micropython-lib-1.8.6-f81e979c56dddb771ad36ec381b7f2c6cd12111f-f81e979c56dddb771ad36ec381b7f2c6cd12111f/_install_tmp/xmltok.py' are the same file
cp: './zipfile.py' and '/home/sandu/work/lede/build_dir/target-mips_24kc_musl-1.1.16/micropython-lib-1.8.6-f81e979c56dddb771ad36ec381b7f2c6cd12111f-f81e979c56dddb771ad36ec381b7f2c6cd12111f/_install_tmp/zipfile.py' are the same file
```

Initially I tried to add exit 0, but that would
just hide other (potentially worse) issues.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-17 15:23:19 +02:00
Philip Prindeville
13e506618b perl-cgi: bump package release because of PKG_LEAVE_COMMENTS
Last commit required release increment so people would refresh to
non-broken files.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-01-11 15:40:52 -07:00
Hannu Nyman
19bb3f7eaf Merge pull request #3740 from pprindeville/fix-perlmod-stripping
perlmod: global knob to disable comment stripping modules
2017-01-11 23:39:14 +02:00
Philip Prindeville
785b67a27e perlmod: global knob to disable comment stripping modules
Certain strings are misinterpreted as comments by perlmod.mk and removed
when they shouldn't be (in particular, perl-cgi).  Enable this whenever
you have sufficient flash space.

Globally, CONFIG_PERL_NOCOMMENT=y (default) causes comments to be stripped
as before.  However, a package (like perl-cgi) can override this with
PKG_LEAVE_COMMENTS=1.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-01-11 14:31:09 -07:00
Michael Heimpold
1a8c52015c php7: add a patch to fix build on aarch64
This fixes the following build error, spotted by the LEDE buildbots:

{standard input}: Assembler messages:
{standard input}:557: Error: operand 3 should be an integer register -- `mul x0,x0,1048576'
{standard input}:558: Error: operand 3 should be an integer register -- `smulh x1,x0,1048576'
Makefile:1466: recipe for target 'ext/opcache/zend_accelerator_module.lo' failed

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-01-11 22:24:26 +01:00
Hannu Nyman
d6f5933bfa Merge pull request #3739 from pprindeville/fix-perl-cgi
perl-cgi: disable comment stripping which damages module
2017-01-11 23:17:28 +02:00
Philip Prindeville
028ad67a5a perl-cgi: disable comment stripping which damages module
The macro perlmod/Install does comment stripping which gets confused by
the line:

in several files in this module, incorrectly deleting it as a comment.
It's not: it's the closure of a "= q/" literal.

See PR #3740 as this is a prerequisite.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2017-01-11 14:14:59 -07:00
Matthias Schiffer
3823ef9bc4 Merge pull request #3813 from NeoRaider/hostpkg
Use STAGING_DIR_HOSTPKG where appropriate
2017-01-11 21:54:09 +01:00
Hannu Nyman
9331f99784 Merge pull request #3811 from commodo/python-gmpy-drop
[RFC] python-gmpy: drop package (in favor or python-gmpy2)
2017-01-11 22:45:40 +02:00
Alexandru Ardelean
b5b6ef34f4 python: bump PKG_RELEASE to 3
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-11 15:16:27 +02:00
Alexandru Ardelean
8ca02842ae python: remove 011-do-not-prefer-ncursesw.patch
LEDE now provides libncursesw by default [even for libncurses].
No need to keep this patch around.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-11 15:16:27 +02:00
Alexandru Ardelean
4e2f4a76e3 python: use built-in libffi lib for host build
Python comes with it's own builtin libffi lib, which
seems easier to use for the host build, than trying
to use the one from the package feeds.

Also, dropping `005-fix-libffi-x86-64-configure.patch`
Not needed anymore.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-11 15:12:21 +02:00
Alexandru Ardelean
ee88853e04 python: link with static libs of ssl, crypto for host builds
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-11 15:12:20 +02:00
Alexandru Ardelean
515468346a Revert "python: don't use libressl for host build"
This reverts commit ca800e60b0.
2017-01-11 15:12:20 +02:00
Alexandru Ardelean
3bfdf6797b python: drop CFLAGS in HOST_CONFIGURE_ARGS ; it's already in HOST_CONFIGURE_VARS
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-11 15:12:19 +02:00
Alexandru Ardelean
ed5cd3e2ce python: remove Host/Install rule default add
I just found out that, that the BUILD_VARIANT var
is not set for the host build, so technically this code
would never get used.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-11 11:02:24 +02:00
Michael Heimpold
3fc9ae5071 php7: update to 7.1.0
Adjust patches for new upstream revision.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2017-01-10 23:07:41 +01:00
Matthias Schiffer
4a984a8d60
treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)
As both LEDE and OpenWrt have STAGING_DIR_HOSTPKG now, we can start to rely
on it. See 73b7f55424 for more information on
STAGING_DIR_HOSTPKG.

STAGING_DIR_HOSTPKG won't actually be changed before the first LEDE release
(it is equivalent to $(STAGING_DIR)/host), so this simple search/replace
cleanup is safe to apply. Doing this cleanup now will be useful for the
Gluon project (an OpenWrt/LEDE based firmware framework) for experimenting
with modifying STAGING_DIR_HOSTPKG before doing this in the LEDE upstream.

Also fixes a typo in the dbus Makefile ("STAGIND_DIR").

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2017-01-10 18:25:54 +01:00
Alexandru Ardelean
462ca31772 python-gmpy: drop package (in favor or python-gmpy2)
Last version was released on 2013-07-28.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-10 15:23:44 +02:00
Matthias Schiffer
876d139c98
python{,3}: remove STAGING_DIR_HOSTPKG fallback definition
STAGING_DIR_HOSTPKG is now defined in both OpenWrt and LEDE, so we can
start to rely on it.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2017-01-10 02:24:29 +01:00
Yousong Zhou
ea9e3b05ef luajit: move patches dir to the right place
Closes #3792

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2017-01-08 22:10:25 +08:00
Daniel Engberg
1c56d7e610 lang/luajit: Move to lua submenu
Move luajit to where the other lua stuff lives

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-01-07 19:54:01 +01:00
Daniel Engberg
8c18ee4662 lang/python3-bottle: Update to 0.12.12
Update to 0.12.12
Switch to pypi repo which also fixes file name on tarball

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-01-07 18:36:32 +01:00
Hannu Nyman
aebb0147e4 Merge pull request #2823 from milani/luajit
luajit: Added luajit package
2017-01-07 14:43:51 +02:00
Morteza Milani
0f3f62edb9 luajit: new package
Add luajit to repo

Signed-off-by: Morteza Milani <milani@pichak.co>
2017-01-07 15:56:53 +03:30
Alexandru Ardelean
ca800e60b0 python: don't use libressl for host build
Fixes: https://github.com/openwrt/packages/issues/3767

Since commit:
f6e6341d89

libressl is built on the host-side.

Python picks it up [ via the openssl/* headers ] and assumes
it has SSL libs.
Compiling works fine, linking fails.
Doesn't look like it's because:
2fd5ce9488

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-06 15:29:21 +02:00
Hannu Nyman
d45c0f1ac0 Merge pull request #3755 from commodo/python3-update-build
python3: sync makefiles with python package
2017-01-04 17:33:27 +02:00
Alexandru Ardelean
3af2027886 python3: sync makefiles with python package
Technically, this just updates build details.
No functionality change to package itself.

So, no need to increase PKG_RELEASE on this change.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-04 17:18:50 +02:00
Alexandru Ardelean
f04641d3d1 python: upgrade to version 2.7.13
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-04 15:08:45 +02:00
Alexandru Ardelean
6d9137048b python: simplify/unify default build rules for python packages
Most python packages use the same build rules & vars.
So, adding them in python-package.mk.

Also, preparing for using VARIANTs for python/python3 packages.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-04 15:08:37 +02:00
Alexandru Ardelean
bb2f8fa8ed python-dev: add python-lib2to3 as dependency
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-04 15:08:37 +02:00
Alexandru Ardelean
165cd9f96a python: update PYTHON_FOR_BUILD (based on python3)
PYTHON_FOR_BUILD is used to build the target python.
Nomally Python scripts detect fine the Python host interpreter
to use for building the Python target interpreter.
But, let's not leave it up to chance anymore.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-04 15:08:36 +02:00
Alexandru Ardelean
9d876738b2 python: remove argument for --with-system-ffi configure arg (based on python3)
And apparently `--with-system-ffi` does not take any arguments.
But it's only in Python 3.6 that a check was added for that.
After checking, Python 2.7 does not take any args either
for `--with-system-ffi` ; so, remove it [for the case when this
change may get backported].

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-04 15:08:36 +02:00
Hannu Nyman
ccb650f109 Merge pull request #3737 from commodo/python3-upgrade
python3: upgrade to version 3.6.0
2017-01-02 22:11:39 +02:00
Alexandru Ardelean
2244ad9f56 python3: upgrade to version 3.6.0
Python 3.6 comes with some new cross-compilation logic that
generates filenames/paths with arch, abiflags and mach
included (in filename & path).

Problem is that the generated paths/filenames are not
consistent across archs (noticed on x86_64 & ar71xx),
so patch `016-adjust-config-paths.patch` was added
to mitigate this (by removing extra stuff in paths).

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2017-01-02 21:46:03 +02:00
Daniel Engberg
e862978eac lang/php7-pecl-http: Drop mbed TLS 1.3 (PolarSSL)
Drop mbed TLS 1.3 (PolarSSL) option as it's EOL.

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-01-01 06:15:30 -06:00
Luiz Angelo Daros de Luca
9682a1d164 ruby: bump to 2.4.0
This is a stable feature release.

Notable changes:

- Introduce hash table improvement (by Vladimir Makarov)
- Binding#irb: Start a REPL session similar to binding.pry
- Unify Fixnum and Bignum into Integer
- String supports Unicode case mappings
- Performance improvements
- Thread#report_on_exception and Thread.report_on_exception changes
- Thread deadlock detection now shows threads with their backtrace and dependency
- Support OpenSSL 1.1.0 (drop support for 0.9.7 or prior)
- ext/tk is now removed from stdlib Feature #8539
- XMLRPC is now removed from stdlib Feature #12160

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2016-12-31 01:54:33 -02:00
Philip Prindeville
b88eb1b6e1 perl-cgi: Bump version to latest
This version is no longer posted on CPAN so point to latest instead.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2016-12-27 16:45:56 +08:00
Michael Heimpold
333957fba9 php7-pecl-http: fix build for big endian (fixes #3691)
While at, improve pre-seeded dependency detection.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-12-23 23:08:29 +01:00
Michael Heimpold
6fa5f409e7 php7-pecl-http: upgrade to 3.1.0
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-12-22 10:27:26 +01:00
Michael Heimpold
200c52e9dd php7-pecl-dio: upgrade to 0.0.9
The upstream release has all the patches already included, so we can
drop them here.
This also fixes issues on 64-bit archs.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-12-22 10:27:26 +01:00
David Thornley
1542acaba7 luarocks: Fix seeded uname (s/m) in siteconfig
LUAROCKS_UNAME_S/LUAROCKS_UNAME_M were being set automatically to host’s architecture and system/kernel name (e.g.. x86 and Darwin for the macOS)
The variables can now be supplied to configure via the supplied patch.
They are currently _S being hardcoded to “Linux” and _M set to the target architecture in the MakeFile.

Signed-off-by: David Thornley <david.thornley@touchstargroup.com>
2016-12-22 18:12:15 +11:00
Hannu Nyman
7abd29bc7c Merge pull request #3659 from jow-/python-move-includes
python: move includes after common package variables
2016-12-16 10:41:49 +02:00
Alexandru Ardelean
985dcd4b28 python3: split python3-version.mk from python3-package.mk
And move \`python3-package.mk\` include, same as in python package.
This is mostly to have consistency/similarity between python & python3
packages.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-12-16 09:07:44 +02:00
Jo-Philipp Wich
49cf5815e3 python: move includes after common package variables
Move the python-host.mk and python-package.mk includes after the definition of
common package variables. This is required to ensure that PKG_UNPACK is not set
to to the dummy "true" command which happens if PKG_SOURCE is not yet set.

Fixes the following error observed while attempting to build Python on a recent
LEDE version:

    make[2]: Entering directory '.../lang/python'
    true
    [ ! -d ./src/ ] || cp -fpR ./src/* .../Python-2.7.12

    Applying ./patches/001-enable-zlib.patch using plaintext:
    can't find file to patch at input line 14
    Perhaps you used the wrong -p or --strip option?
    [...]
    Patch failed!  Please fix ./patches/001-enable-zlib.patch!
    Makefile:242: recipe for target '.../Python-2.7.12/.prepared_...' failed

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2016-12-16 03:24:19 +01:00
Hannu Nyman
11078f3895 Merge pull request #3592 from commodo/python-setuptools-fix
python-setuptools,python3-setuptools: fix path creation in setup scripts
2016-11-28 22:52:06 +02:00
Alexandru Ardelean
c3441865ca python3-setuptools: fix path creation in setup scripts
Same as for python-setuptools (in previous commit).

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-28 16:51:11 +02:00
Alexandru Ardelean
df840c1e9f python-setuptools: fix path creation in setup scripts
This was fixed a few versions back.
But then python-setuptools changed.

The problem is that python scripts installed via setuptools
& pip would have `#!/build_dir_path/staging_dir/target-x86_64_musl-1.1.15/host/bin/python`
as the path in the script, rather than the path on the target (`/usr/bin/python`).

This fixes that.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-28 16:49:23 +02:00
Luiz Angelo Daros de Luca
12e314488b Merge pull request #3547 from luizluca/ruby-update
ruby: bump to 2.3.3
2016-11-22 14:58:55 -02:00
Luiz Angelo Daros de Luca
b6a9980d40 ruby: bump to 2.3.3
This release contains a bug fix about Refinements and Module#prepend.
The mixture use of Module#refine and Module#prepend to the same Class
could cause unexpected NoMethodError. This is a regression on Ruby 2.3.2
released last week. See [Bug #12920] for details.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2016-11-22 14:55:11 -02:00
Breuss Simon
7e1b756cd3 update micropython and micropython-lib to v1.8.6
Signed-off-by: Breuss Simon <simon.breuss@gmail.com>
2016-11-21 20:07:32 +01:00
Andrew McConachie
398109118c lang/python-pcapy: Added python-pcapy package
https://github.com/CoreSecurity/pcapy
Pcapy is a Python extension module that enables software written in Python to access the routines from the pcap packet capture library.

Signed-off-by: Andrew McConachie <andrew@depht.com>>
2016-11-19 13:12:19 -05:00
Luiz Angelo Daros de Luca
1f8432ab9a ruby: bump to 2.3.2
This release contains update of RubyGems 2.5.2 and update of included ssl certificates.

There are many bugfixes too. See the http://svn.ruby-lang.org/repos/ruby/tags/v2_3_2/ChangeLog
for details.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2016-11-18 04:50:12 -02:00
Michael Heimpold
583af8565e php7: update to 7.0.13
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2016-11-16 21:12:39 +01:00
Alexandru Ardelean
ee512fa36f python-dns: add python-setuptools/host as build dependency
After commit a4b0c0a9fb
python host does not install/have the built-in setuptools package.

So, for python-dns, we need to add it explicitly (since it's required).

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-09 09:35:19 +02:00
Alexandru Ardelean
556821951d python-dns: use --prefix & --root config options
Does not fix anything, just brings it inline with the
other python packages.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-09 09:28:34 +02:00
Alexandru Ardelean
9eca45fdf1 python, python3: unify HOST_ vars and get rid of HOST_CFLAGS
--sysconfigdir and --sbindir are obtained from --prefix
and --exec-prefix, so no need to have them explicitly

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-07 10:55:34 +02:00
Alexandru Ardelean
7d89234b86 python,python3: get rid of HOST_CFLAGS
They rely on system paths and are a bit misleading/confusing.
As seen here:
https://github.com/openwrt/packages/issues/3339

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-07 10:55:33 +02:00
Alexandru Ardelean
e81632ab90 python3: disable ensurepip on package & host builds
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-07 10:55:33 +02:00
Alexandru Ardelean
6a670f42b1 python: move PYTHON_VERSION in own .mk file
Allows for more granularity with respect to python-host.mk
and python-package.mk inclusions.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2016-11-07 10:55:31 +02:00
Alexandru Ardelean
45bdb70e1e python: add include guard for python-host.mk and include in Makefile
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>
2016-11-07 09:27:20 +02:00
Gergely Kiss
ed56b2ea43 python-urllib3: update to version 1.19
Signed-off-by: Gergely Kiss <mail.gery@gmail.com>
2016-11-06 17:36:20 +01:00
Hannu Nyman
d015c6edfe Merge pull request #2922 from cshore/pull-request-fix-perl-utf8-dependency
lang/perlbase: Fix missing utf8 dependency on unicore
2016-11-06 11:57:42 +02:00
Hannu Nyman
2ae49e2b16 Merge pull request #3460 from Shulyaka/python-dns
python-dns: version update to 1.15.0
2016-11-04 09:28:37 +02:00
Denis Shulyaka
0e8e30eb6b python-dns: version update to 1.15.0
Signed-off-by: Denis Shulyaka <Shulyaka@gmail.com>
2016-11-03 18:15:55 +03:00
Jo-Philipp Wich
4a083de4a9 python3: avoid use of HOST_BUILD_PREFIX
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>
2016-11-01 12:57:41 +01:00
Jo-Philipp Wich
73b7f55424 python: avoid use of HOST_BUILD_PREFIX
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>
2016-11-01 12:57:36 +01:00
Hannu Nyman
b24ba82cce Merge pull request #3423 from commodo/python-include-host-build
python,python3: include host-build.mk in python-host.mk & python3-package.mk
2016-10-31 10:05:46 +02:00