diff options
| author | Unrud <Unrud@users.noreply.github.com> | 2019-05-04 19:59:05 +0300 |
|---|---|---|
| committer | Patrick <tingping@tingping.se> | 2019-05-04 19:59:05 +0300 |
| commit | be562eb628df06bfedc45b32fdb04c5f4c3871ce (patch) | |
| tree | 21fb20aed39ed03181b2e87633f7ccb64eae703e /pygame | |
| parent | daf7cd6c3dad23f6f7d80fb292a3b9528d7c582f (diff) | |
pygame: Use env PYGAME_EXTRA_BASE instead of patch and fix lib search paths (#62)
Diffstat (limited to 'pygame')
| -rw-r--r-- | pygame/pygame-1.9.4.json | 28 | ||||
| -rw-r--r-- | pygame/pygame-add-search-dirs.patch | 27 |
2 files changed, 23 insertions, 32 deletions
diff --git a/pygame/pygame-1.9.4.json b/pygame/pygame-1.9.4.json index 2984e0e..b80e892 100644 --- a/pygame/pygame-1.9.4.json +++ b/pygame/pygame-1.9.4.json @@ -5,10 +5,6 @@ "type": "archive", "url": "https://files.pythonhosted.org/packages/b2/6b/c510f0853765eb2219ca5aa3d416d65bb0dea7cd9bb2984aea0a0e04c24d/pygame-1.9.4.tar.gz", "sha256": "700d1781c999af25d11bfd1f3e158ebb660f72ebccb2040ecafe5069d0b2c0b6" - }, - { - "type": "patch", - "path": "pygame-add-search-dirs.patch" } ], "buildsystem": "simple", @@ -18,7 +14,29 @@ "build-options": { "env": { "PORTMIDI_INC_PORTTIME": "1", - "LOCALBASE": "/app" + "PYGAME_EXTRA_BASE": "/app" + }, + "arch": { + "aarch64": { + "env": { + "ORIGLIBDIRS": "/lib:/lib64:/lib/aarch64-linux-gnu" + } + }, + "arm": { + "env": { + "ORIGLIBDIRS": "/lib:/lib/arm-linux-gnueabihf" + } + }, + "i386": { + "env": { + "ORIGLIBDIRS": "/lib:/lib/i386-linux-gnu" + } + }, + "x86_64": { + "env": { + "ORIGLIBDIRS": "/lib:/lib64:/lib/x86_64-linux-gnu" + } + } } }, "modules": [ diff --git a/pygame/pygame-add-search-dirs.patch b/pygame/pygame-add-search-dirs.patch deleted file mode 100644 index 13366c2..0000000 --- a/pygame/pygame-add-search-dirs.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -r 407caa445ee0 config_unix.py ---- a/config_unix.py Mon Jan 16 21:12:10 2017 +0000 -+++ b/config_unix.py Fri Mar 03 15:10:07 2017 +0000 -@@ -110,6 +110,12 @@ - self.found = 1 - else: - print (self.name + ' '[len(self.name):] + ': not found') -+ print('incname', incname) -+ print('incdirs', incdirs) -+ print('self.inc_dir', self.inc_dir) -+ print('libnames', libnames) -+ print('libdirs', libdirs) -+ print('self.lib_dir', self.lib_dir) - - - class DependencyPython: -@@ -195,8 +201,8 @@ - incdirs += ["/usr/local"+d for d in origincdirs] - libdirs += ["/usr/local"+d for d in origlibdirs] - if localbase: -- incdirs = [localbase+d for d in origincdirs] -- libdirs = [localbase+d for d in origlibdirs] -+ incdirs += [localbase+d for d in origincdirs] -+ libdirs += [localbase+d for d in origlibdirs] - - for arg in DEPS[0].cflags.split(): - if arg[:2] == '-I': |