iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
package/irrlicht/0003-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch Normal file
View File

@@ -0,0 +1,36 @@
From 0ecb59c4dc575bb902c1955d8762f91ff79290a4 Mon Sep 17 00:00:00 2001
From: Bartosz Bilas <b.bilas@grinn-global.com>
Date: Tue, 23 Jun 2020 19:36:27 +0200
Subject: [PATCH] makefile: override LDFLAGS and remove obsolete X11R6
lib/include directories
Add "override" keyword to LDFLAGS variable in order to link libraries
using buildroot cross-compiler correctly and remove those non-supported
paths to lib/includes that are not used and not available in buildroot
and in addition point to the host system libraries in a result
cause the following warning:
/home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: warning: library search path "/usr/X11R6/lib" is unsafe for cross-compilation
Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
---
source/Irrlicht/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile
index 1a8277e..b323237 100644
--- a/source/Irrlicht/Makefile
+++ b/source/Irrlicht/Makefile
@@ -88,8 +88,7 @@ STATIC_LIB = libIrrlicht.a
LIB_PATH = ../../lib/$(SYSTEM)
INSTALL_DIR = /usr/local/lib
sharedlib install: SHARED_LIB = libIrrlicht.so
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+sharedlib: override LDFLAGS += -lGL -lXxf86vm
#OSX specific options
staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
--
2.27.0

9
package/irrlicht/irrlicht.hash
View File

@@ -1,5 +1,10 @@
# From https://sourceforge.net/projects/irrlicht/files/Irrlicht%20SDK/1.8/1.8.4
md5 9401cfff801395010b0912211f3cbb4f irrlicht-1.8.4.zip
sha1 38bf0223fe868d243d6a39d0dc191c8df6e03b3b irrlicht-1.8.4.zip
# locally calculated
sha256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 irrlicht-1.8.4.zip
# Locally calculated
sha256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 irrlicht-1.8.4.zip
sha256 cc86e0b830f9d48933feb198f2741a7d9bb7c34fe8a35302d8ce36b8e2ecb27b doc/aesGladman.txt
sha256 e8a6b63336018eec09ac3a7cdfe5a80bda635641bc0397a77b8baa25bed03800 doc/bzip2-license.txt
sha256 ca38f1ba4ab901111f6eee50009bd46dbd866e6beb98d592d843f7c162d73409 doc/irrlicht-license.txt
sha256 67f098c29401646a0f52da432efc3bab0433c13f17effc3314e9fa523da51b75 doc/jpglib-license.txt
sha256 e0f86c3e4acd285618faa55735ceedce46084a3cfb06b8f31d0d092bb68ae151 doc/libpng-license.txt

7
package/irrlicht/irrlicht.mk
View File

@@ -38,6 +38,13 @@ ifeq ($(BR2_STATIC_LIBS),)
IRRLICHT_CONF_OPTS += sharedlib
endif
# Irrlicht fail to detect properly the NEON support on aarch64 or ARM with NEON FPU support.
# While linking an application with libIrrlicht.so, we get an undefined reference to
# png_init_filter_functions_neon.
# Some files are missing in the libpng bundled in Irrlicht, in particular arm/arm_init.c,
# so disable NEON support completely.
IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0"
define IRRLICHT_BUILD_CMDS
$(TARGET_MAKE_ENV)
$(MAKE) -C $(@D)/$(IRRLICHT_SUBDIR) $(IRRLICHT_CONF_OPTS)