svn commit: r399614 - in head/x11/bmpanel2: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Sun Oct 18 11:55:42 UTC 2015
Author: danfe
Date: Sun Oct 18 11:55:40 2015
New Revision: 399614
URL: https://svnweb.freebsd.org/changeset/ports/399614
Log:
- Unbreak the build on -CURRENT by explicitly linking against libm as a
remedy to the following error:
[100%] Linking C executable bmpanel2
/usr/bin/ld: undefined reference to symbol `truncf@@FBSD_1.0' (try
adding -lm)
//lib/libm.so.5: could not read symbols: Bad value
- While here fix long standing issue of -L${LOCALBASE}/lib being required
in LDFLAGS while USES=pkgconfig due to missing LINK_DIRECTORIES() call
in the top-level `CMakeLists.txt'
Added:
head/x11/bmpanel2/files/
head/x11/bmpanel2/files/patch-CMakeLists.txt (contents, props changed)
Modified:
head/x11/bmpanel2/Makefile
Modified: head/x11/bmpanel2/Makefile
==============================================================================
--- head/x11/bmpanel2/Makefile Sun Oct 18 10:36:06 2015 (r399613)
+++ head/x11/bmpanel2/Makefile Sun Oct 18 11:55:40 2015 (r399614)
@@ -18,8 +18,6 @@ USES= cmake pkgconfig
USE_GNOME= pango
USE_XORG= x11 xext
-LDFLAGS+= -L${LOCALBASE}/lib # XXX should not be needed
-
OPTIONS_DEFINE= OPACITY TEMPERATURE
OPACITY_DESC= Opacity setting with compositing window managers
TEMPERATURE_DESC= Build with temperature widget (for CPU, etc.)
Added: head/x11/bmpanel2/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/bmpanel2/files/patch-CMakeLists.txt Sun Oct 18 11:55:40 2015 (r399614)
@@ -0,0 +1,15 @@
+--- CMakeLists.txt.orig 2009-11-01 05:50:26 UTC
++++ CMakeLists.txt
+@@ -50,9 +50,11 @@ PKG_CHECK_MODULES(GTHREAD REQUIRED gthre
+
+ INCLUDE_DIRECTORIES(${X11_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS})
++LINK_DIRECTORIES(${X11_LIBRARY_DIRS} ${CAIRO_LIBRARY_DIRS}
++ ${GLIB_LIBRARY_DIRS} ${GTHREAD_LIBRARY_DIRS} ${PANGO_LIBRARY_DIRS})
+
+ ADD_EXECUTABLE(${BMPANEL_EXECUTABLE_NAME} ${SOURCES})
+-TARGET_LINK_LIBRARIES(${BMPANEL_EXECUTABLE_NAME} ${X11_LIBRARIES}
++TARGET_LINK_LIBRARIES(${BMPANEL_EXECUTABLE_NAME} -lm ${X11_LIBRARIES}
+ ${CAIRO_LIBRARIES} ${GLIB_LIBRARIES} ${GTHREAD_LIBRARIES} ${PANGO_LIBRARIES})
+
+ # OPTIONS
More information about the svn-ports-head
mailing list