package/irrlicht: fix libraries linking
PATCH v2 1/1 package/irrlicht: fix libraries linking
These patches fix the irrlicht makefile which contains the paths that point to the host system libraries that are not used and are not available in Buildroot what's unsafe for cross-compilation. In addition they fix linking to the X11 libraries and the following errors:
/home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/bartekk/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libIrrlicht.so: undefined reference to `XSetSelectionOwner' /home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/bartekk/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libIrrlicht.so: undefined reference to `glXGetProcAddress' /home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/bartekk/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libIrrlicht.so: undefined reference to `glXMakeCurrent' /home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/bartekk/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libIrrlicht.so: undefined reference to `XF86VidModeSetViewPort' /home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/bartekk/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libIrrlicht.so: undefined reference to `XF86VidModeSwitchToMode' /home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/bartekk/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libIrrlicht.so: undefined reference to `glClearDepth' /home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/bartekk/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libIrrlicht.so: undefined reference to `XGetVisualInfo' /home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/bartekk/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libIrrlicht.so: undefined reference to `XGrabKeyboard' /home/bartekk/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-gnueabihf/9.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: /home/bartekk/buildroot/output/host/arm-buildroot-linux-gnueabihf/sysroot/usr/lib/libIrrlicht.so: undefined reference to `glMatrixMode'
---
Changes v1 -> v2:
- patches merged into one
- explained commit log
IMPORTANT NOTE:
Irrlicht uses CRLF line endings so the patches must be fixed when applying because patchwork drops all the CR and keeps on LF.
.../0003-makefile-override-LDFLAGS.patch | 29 ++++++++++++++++ ...obsolete-X11R6-lib-include-directori.patch | 33 +++++++++++++++++++ package/irrlicht/irrlicht.mk | 4 ++- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 package/irrlicht/0003-makefile-override-LDFLAGS.patch create mode 100644 package/irrlicht/0004-makefile-remove-obsolete-X11R6-lib-include-directori.patch
package/irrlicht/0003-makefile-override-LDFLAGS.patch new file +29 -0
@@ -0,0 +1,29 @@ +From f597ac417f0eefab8f388afe617a0d07d08d87bb Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas <[email protected]> +Date: Sun, 21 Jun 2020 12:57:47 +0200 +Subject: [PATCH] makefile: override LDFLAGS + +That's needed to fix proper linking to X11 libraries +within package makefile. + +Signed-off-by: Bartosz Bilas <[email protected]> +--- + source/Irrlicht/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index 9a1bdbc..85eb264 100644 +--- a/source/Irrlicht/Makefile ++++ b/source/Irrlicht/Makefile +@@ -88,7 +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 ++sharedlib: override LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm + staticlib sharedlib: CXXINCS += -I/usr/X11R6/include + + #OSX specific options +-- +2.27.0 +
package/irrlicht/0004-makefile-remove-obsolete-X11R6-lib-include-directori.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 9a4109dfceccc2e702a6928ec612ee790a31dea7 Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas <[email protected]> +Date: Mon, 22 Jun 2020 20:26:51 +0200 +Subject: [PATCH] makefile: remove obsolete X11R6 lib/include directories + +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 <[email protected]> +--- + source/Irrlicht/Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index fed6c7e..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: override 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 +
package/irrlicht/irrlicht.mk +3 -1
@@ -38,12 +38,14 @@ ifeq ($(BR2_STATIC_LIBS),) IRRLICHT_CONF_OPTS += sharedlib endif +# set correct path for libraries linking +IRRLICHT_CONF_OPTS += LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" # 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" +IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0 -I$(STAGING_DIR)/usr/include/X11" define IRRLICHT_BUILD_CMDS $(TARGET_MAKE_ENV)
Signature · 1 line
2.27.0
PATCH v2 1/1 package/irrlicht: fix libraries linking
Quoted 26 lines · On Mon, 22 Jun 2020 20:45:15 +0200 Bartosz Bilas <[email protected]>…
.../0003-makefile-override-LDFLAGS.patch | 29 ++++++++++++++++ ...obsolete-X11R6-lib-include-directori.patch | 33 +++++++++++++++++++ package/irrlicht/irrlicht.mk | 4 ++- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 package/irrlicht/0003-makefile-override-LDFLAGS.patch create mode 100644 package/irrlicht/0004-makefile-remove-obsolete-X11R6-lib-include-directori.patchpackage/irrlicht/0003-makefile-override-LDFLAGS.patch new file +13
-0@@ -0,0 +1,29 @@ +From f597ac417f0eefab8f388afe617a0d07d08d87bb Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas <[email protected]> +Date: Sun, 21 Jun 2020 12:57:47 +0200 +Subject: [PATCH] makefile: override LDFLAGS + +That's needed to fix proper linking to X11 libraries +within package makefile. + +Signed-off-by: Bartosz Bilas <[email protected]> +--- + source/Irrlicht/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +
package/irrlicht/0003-makefile-override-LDFLAGS.patch line 23
Quoted 10 lines
package/irrlicht/0003-makefile-override-LDFLAGS.patch new file +10
-0+diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index 9a1bdbc..85eb264 100644 +--- a/source/Irrlicht/Makefile ++++ b/source/Irrlicht/Makefile +@@ -88,7 +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 ++sharedlib: override LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
Why here are you changing the LDFLAGS to override LDFLAGS.
package/irrlicht/0003-makefile-override-LDFLAGS.patch
Quoted 11 lines
package/irrlicht/0003-makefile-override-LDFLAGS.patch new file +11
-0+diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index fed6c7e..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: override LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm +-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include ++sharedlib: override LDFLAGS += -lGL -lXxf86vm
And here you drop entirely the -L argument ?
Or is it two consecutive patches that have been merged upstream ?
package/irrlicht/0003-makefile-override-LDFLAGS.patch
Quoted 2 lines
package/irrlicht/0003-makefile-override-LDFLAGS.patch new file +2
-0+# set correct path for libraries linking +IRRLICHT_CONF_OPTS += LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib"
This should not be necessary, STAGING_DIR/usr/lib is already the default search path for libraries in the Buildroot cross-compiler. Could you test without this ?
package/irrlicht/0003-makefile-override-LDFLAGS.patch
Quoted 7 lines
# 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.package/irrlicht/0003-makefile-override-LDFLAGS.patch new file +1
-1-IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0" +IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0 -I$(STAGING_DIR)/usr/include/X11"
It is a bit weird to have this below the NEON related comment.
Can we change that to:
IRRLICHT_CPPFLAGS = $(TARGET_CPPFLAGS)
# blabla about NEON IRRLICHT_CPPFLAGS += -DPNG_ARM_NEON_OPT=0
# blabla about X11 includes IRRLICHT_CPPFLAGS += -I$(STAGING_DIR)/usr/include
IRRLICHT_CONF_OPTS += CPPFLAGS="$(IRRLICHT_CPPFLAGS)"
It is a bit sad that they don't use pkg-config, but oh well, we can live with this explicit -I flag.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 package/irrlicht: fix libraries linking
Hello Thomas,
Quoted 42 lines · Thomas Petazzoni
Quoted 26 lines · On Mon, 22 Jun 2020 20:45:15 +0200 Bartosz Bilas <[email protected]>…
.../0003-makefile-override-LDFLAGS.patch | 29 ++++++++++++++++ ...obsolete-X11R6-lib-include-directori.patch | 33 +++++++++++++++++++ package/irrlicht/irrlicht.mk | 4 ++- 3 files changed, 65 insertions(+), 1 deletion(-)create mode 100644
package/irrlicht/0003-makefile-override-LDFLAGS.patch
create mode 100644package/irrlicht/0004-makefile-remove-obsolete-X11R6-lib-include-directori.patchpackage/irrlicht/0003-makefile-override-LDFLAGS.patch new file +13
-0@@ -0,0 +1,29 @@ +From f597ac417f0eefab8f388afe617a0d07d08d87bb Mon Sep 17 00:00:00 2001 +From: Bartosz Bilas <[email protected]> +Date: Sun, 21 Jun 2020 12:57:47 +0200 +Subject: [PATCH] makefile: override LDFLAGS + +That's needed to fix proper linking to X11 libraries +within package makefile. + +Signed-off-by: Bartosz Bilas <[email protected]> +--- + source/Irrlicht/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +package/irrlicht/0003-makefile-override-LDFLAGS.patch line 23
Quoted 10 lines
package/irrlicht/0003-makefile-override-LDFLAGS.patch new file +10
-0+diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index 9a1bdbc..85eb264 100644 +--- a/source/Irrlicht/Makefile ++++ b/source/Irrlicht/Makefile +@@ -88,7 +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 ++sharedlib: override LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vmWhy here are you changing the LDFLAGS to override LDFLAGS.
Quoted 12 lines
package/irrlicht/0003-makefile-override-LDFLAGS.patch
Quoted 11 lines
package/irrlicht/0003-makefile-override-LDFLAGS.patch new file +11
-0+diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index fed6c7e..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: override LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm +-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include ++sharedlib: override LDFLAGS += -lGL -lXxf86vmAnd here you drop entirely the -L argument ?
Due to the fact that it points to the host system libraries. This -L argument is set correctly within package makefile.
Quoted 2 lines
Or is it two consecutive patches that have been merged upstream ?
No, they have not.
Quoted 6 lines
package/irrlicht/0003-makefile-override-LDFLAGS.patch
Quoted 3 lines
package/irrlicht/0003-makefile-override-LDFLAGS.patch new file +2
-0+# set correct path for libraries linking +IRRLICHT_CONF_OPTS += LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib"This should not be necessary, STAGING_DIR/usr/lib is already the default search path for libraries in the Buildroot cross-compiler. Could you test without this ?
It seems to work quite well without this line.
Quoted 14 lines
package/irrlicht/0003-makefile-override-LDFLAGS.patch
Quoted 8 lines
# 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.package/irrlicht/0003-makefile-override-LDFLAGS.patch new file +1
-1-IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0" +IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0 -I$(STAGING_DIR)/usr/include/X11"It is a bit weird to have this below the NEON related comment.
Can we change that to:
IRRLICHT_CPPFLAGS= $(TARGET_CPPFLAGS)
Quoted 7 lines
# blabla about NEON IRRLICHT_CPPFLAGS += -DPNG_ARM_NEON_OPT=0# blabla about X11 includes IRRLICHT_CPPFLAGS += -I$(STAGING_DIR)/usr/include
IRRLICHT_CONF_OPTS+= CPPFLAGS="$(IRRLICHT_CPPFLAGS)"
Good hint, I was thinking about a bit different approach but it wasn't working as I expected therefore I did it as it's above.
Quoted 2 lines
It is a bit sad that they don't use pkg-config, but oh well, we can live with this explicit -I flag. Thanks! Thomas
Best
Bartek
PATCH v2 1/1 package/irrlicht: fix libraries linking
Quoted 17 lines · On Mon, 22 Jun 2020 22:23:35 +0200 Bartosz Bilas <[email protected]>…
Quoted 5 lines
Quoted 2 lines
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm ++sharedlib: override LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vmWhy here are you changing the LDFLAGS to override LDFLAGS.
Quoted 12 lines
package/irrlicht/0004-makefile-remove-obsolete-X11R6-lib-include-directori.patch line 27
Quoted 11 lines
package/irrlicht/0004-makefile-remove-obsolete-X11R6-lib-include-directori.patch new file +11
-0+diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index fed6c7e..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: override LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm +-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include ++sharedlib: override LDFLAGS += -lGL -lXxf86vmAnd here you drop entirely the -L argument ?
Quoted 2 lines
Due to the fact that it points to the host system libraries. This -L argument is set correctly within package makefile.
Yes, of course. My question is why do you have two patches? They touch exactly the same line, simply do the change in two steps instead of one. Am I missing something here ?
Quoted 6 lines
Quoted 5 lines
package/irrlicht/irrlicht.mk ifeq ($(BR2_STATIC_LIBS),) · line 42
Quoted 2 lines
package/irrlicht/irrlicht.mk +2
-0+# set correct path for libraries linking +IRRLICHT_CONF_OPTS += LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib"This should not be necessary, STAGING_DIR/usr/lib is already the default search path for libraries in the Buildroot cross-compiler. Could you test without this ?
It seems to work quite well without this line.
Yes, as I said, -L$(STAGING_DIR)/usr/lib is useless.
Quoted 17 lines
Quoted 17 lines
package/irrlicht/irrlicht.mk ifeq ($(BR2_STATIC_LIBS),) · line 48
Quoted 8 lines
# 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.package/irrlicht/irrlicht.mk +1
-1-IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0" +IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0 -I$(STAGING_DIR)/usr/include/X11"It is a bit weird to have this below the NEON related comment.
Can we change that to:
IRRLICHT_CPPFLAGS= $(TARGET_CPPFLAGS)# blabla about NEON IRRLICHT_CPPFLAGS += -DPNG_ARM_NEON_OPT=0
Quoted 6 lines
Quoted 4 lines
# blabla about X11 includes IRRLICHT_CPPFLAGS += -I$(STAGING_DIR)/usr/include
IRRLICHT_CONF_OPTS+= CPPFLAGS="$(IRRLICHT_CPPFLAGS)"Good hint, I was thinking about a bit different approach but it wasn't working as I expected therefore I did it as it's above.
So I guess you'll rework accordingly? If needed, you can also have a preparation patch that reworks this IRRLICHT_CPPFLAGS thing for the NEON stuff, and then another patch that fixes the library linking issue.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 package/irrlicht: fix libraries linking
Hello Thomas,
Quoted 20 lines · Thomas Petazzoni
Quoted 17 lines · On Mon, 22 Jun 2020 22:23:35 +0200 Bartosz Bilas <[email protected]>…
Quoted 17 lines
Quoted 2 lines
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm ++sharedlib: override LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
Why here are you changing the LDFLAGS to override LDFLAGS.
package/irrlicht/0004-makefile-remove-obsolete-X11R6-lib-include-directori.patch line 27
Quoted 11 lines
package/irrlicht/0004-makefile-remove-obsolete-X11R6-lib-include-directori.patch new file +11
-0+diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index fed6c7e..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: override LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm +-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include ++sharedlib: override LDFLAGS += -lGL -lXxf86vmAnd here you drop entirely the -L argument ?
Quoted 5 lines
Quoted 2 lines
Due to the fact that it points to the host system libraries. This -L argument is set correctly within package makefile.
Yes, of course. My question is why do you have two patches? They touch exactly the same line, simply do the change in two steps instead of one. Am I missing something here ?
Ah, I didn't want to combine everything into one patch because there were 2 different changes (adding keyword and removing paths) but I'm gonna combine it into one patch then.
Quoted 29 lines
Quoted 7 lines
Quoted 6 lines
package/irrlicht/irrlicht.mk ifeq ($(BR2_STATIC_LIBS),) · line 42
Quoted 3 lines
package/irrlicht/irrlicht.mk +2
-0+# set correct path for libraries linking +IRRLICHT_CONF_OPTS += LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib"This should not be necessary, STAGING_DIR/usr/lib is already the default search path for libraries in the Buildroot cross-compiler. Could you test without this ?
It seems to work quite well without this line.
Yes, as I said, -L$(STAGING_DIR)/usr/lib is useless.
Quoted 20 lines
Quoted 20 lines
package/irrlicht/irrlicht.mk ifeq ($(BR2_STATIC_LIBS),) · line 48
Quoted 8 lines
# 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.package/irrlicht/irrlicht.mk +1
-1-IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0" +IRRLICHT_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DPNG_ARM_NEON_OPT=0 -I$(STAGING_DIR)/usr/include/X11"It is a bit weird to have this below the NEON related comment.
Can we change that to:
IRRLICHT_CPPFLAGS= $(TARGET_CPPFLAGS)# blabla about NEON IRRLICHT_CPPFLAGS += -DPNG_ARM_NEON_OPT=0# blabla about X11 includes IRRLICHT_CPPFLAGS += -I$(STAGING_DIR)/usr/include
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
IRRLICHT_CONF_OPTS+= CPPFLAGS="$(IRRLICHT_CPPFLAGS)"Good hint, I was thinking about a bit different approach but it wasn't working as I expected therefore I did it as it's above.
So I guess you'll rework accordingly? If needed, you can also have a preparation patch that reworks this
IRRLICHT_CPPFLAGSthing for the NEON stuff, and then another patch that fixes the library linking issue.Thomas
It turned out that -I$(STAGING_DIR)/usr/include isn't necessary anymore so I've decided not to touch that.
Best
Bartek
PATCH v2 1/1 package/irrlicht: fix libraries linking
Quoted 8 lines · On Tue, 23 Jun 2020 20:08:47 +0200 Bartosz Bilas <[email protected]>…
Quoted 5 lines
Quoted 2 lines
Due to the fact that it points to the host system libraries. This -L argument is set correctly within package makefile.
Yes, of course. My question is why do you have two patches? They touch exactly the same line, simply do the change in two steps instead of one. Am I missing something here ?
Ah, I didn't want to combine everything into one patch because there were 2 different changes (adding keyword and removing paths) but I'm gonna combine it into one patch then.
OK, it's true you can see it as: one allows to override the LDFLAGS, the other drops a bogus hardcoded path.
Quoted 11 lines
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
IRRLICHT_CONF_OPTS+= CPPFLAGS="$(IRRLICHT_CPPFLAGS)"Good hint, I was thinking about a bit different approach but it wasn't working as I expected therefore I did it as it's above.
So I guess you'll rework accordingly? If needed, you can also have a preparation patch that reworks this
IRRLICHT_CPPFLAGSthing for the NEON stuff, and then another patch that fixes the library linking issue.Thomas
It turned out that -I$(STAGING_DIR)/usr/include isn't necessary anymore so I've decided not to touch that.
-I$(STAGING_DIR)/usr/include is definitely useless as it's the default search path for headers for the Buildroot cross-compiler, but that's not what you were adding: you were adding -I$(STAGING_DIR)/usr/include/X11R6, which is not in the default search path for headers.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 package/irrlicht: fix libraries linking
Hi Thomas,
Quoted 22 lines · Thomas Petazzoni
Quoted 8 lines · On Tue, 23 Jun 2020 20:08:47 +0200 Bartosz Bilas <[email protected]>…
Quoted 5 lines
Quoted 2 lines
Due to the fact that it points to the host system libraries. This -L argument is set correctly within package makefile.
Yes, of course. My question is why do you have two patches? They touch exactly the same line, simply do the change in two steps instead of one. Am I missing something here ?
Ah, I didn't want to combine everything into one patch because there were 2 different changes (adding keyword and removing paths) but I'm gonna combine it into one patch then.
OK, it's true you can see it as: one allows to override the LDFLAGS, the other drops a bogus hardcoded path.
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
IRRLICHT_CONF_OPTS+= CPPFLAGS="$(IRRLICHT_CPPFLAGS)"Good hint, I was thinking about a bit different approach but it wasn't working as I expected therefore I did it as it's above.
So I guess you'll rework accordingly? If needed, you can also have a preparation patch that reworks this
IRRLICHT_CPPFLAGSthing for the NEON stuff, and then another patch that fixes the library linking issue.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Thomas
It turned out that -I$(STAGING_DIR)/usr/include isn't necessary anymore so I've decided not to touch that.
-I$(STAGING_DIR)/usr/include is definitely useless as it's the default search path for headers for the Buildroot cross-compiler, but that's not what you were adding: you were adding -I$(STAGING_DIR)/usr/include/X11R6, which is not in the default search path for headers. Best regards, Thomas
No, previously I was adding -I$(STAGING_DIR)/usr/include/X11 but this path wasn't necessary therefore in the v3 there is no this path anymore. This -I$(STAGING_DIR)/usr/include/X11R6 path was the default one which I've removed from the makefile.
I hope that everything is clear now ;)
Best
Bartek