瀏覽代碼

fltk: fix build issue caused by rpath

The fltk build system has some logic that causes it to pass
-Wl,-rpath,/usr/lib when --libdir is not /usr/lib. However, in our
case, libdir is ${exec_prefix}/lib, and is not expanded to /usr/lib
before the rpath related test is done. Rather than fixing the fltk
build system, this commit works around the problem by explicitly
passing --libdir=/usr/lib.

Fixes:

  http://autobuild.buildroot.org/results/8d1/8d1b202a182e3fb5dee21f20afc9f749c2defa1a/

and many other similar build failures that have been occuring since 1+
year.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thomas Petazzoni 10 年之前
父節點
當前提交
a125d213b4
共有 1 個文件被更改,包括 8 次插入1 次删除
  1. 8 1
      package/fltk/fltk.mk

+ 8 - 1
package/fltk/fltk.mk

@@ -8,8 +8,15 @@ FLTK_VERSION = 1.3.2
 FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz
 FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION)
 FLTK_INSTALL_STAGING = YES
+# We force --libdir=/usr/lib, because by default, it is set to
+# ${exec_prefix}/lib, which doesn't match the condition used by the
+# fltk build system to decide whether it should pass a -rpath,/usr/lib
+# or not. Since this rpath breaks the build, we want the fltk build
+# system to not pass it, which requires having --libdir set to
+# /usr/lib.
 FLTK_CONF_OPTS = --enable-threads --with-x --disable-gl \
-	--disable-localjpeg --disable-localpng --disable-localzlib
+	--disable-localjpeg --disable-localpng --disable-localzlib \
+	--libdir=/usr/lib
 FLTK_DEPENDENCIES = jpeg libpng xlib_libX11 xlib_libXext xlib_libXt
 FLTK_CONFIG_SCRIPTS = fltk-config
 FLTK_LICENSE = LGPLv2 with exceptions