Bug 180608 - [patch] graphics/oyranos: fix package build
Summary: [patch] graphics/oyranos: fix package build
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Boris Samorodov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-07-17 14:30 UTC by Tijl Coosemans
Modified: 2013-08-07 11:20 UTC (History)
0 users

See Also:


Attachments
oyranos.patch (519 bytes, patch)
2013-07-17 14:30 UTC, Tijl Coosemans
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tijl Coosemans freebsd_committer 2013-07-17 14:30:00 UTC
Fix for this package build error:
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.8.20130716075822.pointyhat/oyranos-0.9.4.log

Apparently the INDEX is built on a machine with clang while the package
is not, so add a limit on OSVERSION like editors/libreoffice does.

Also, it may be better to replace USE_GCC with a build dependency on
lang/clang. USE_GCC adds a run dependency on gcc which makes the package
a lot heavier to download and install.
Comment 1 Edwin Groothuis freebsd_committer 2013-07-17 14:30:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->bsam

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer 2013-08-07 11:10:19 UTC
Author: bsam
Date: Wed Aug  7 10:10:06 2013
New Revision: 324338
URL: http://svnweb.freebsd.org/changeset/ports/324338

Log:
  . fix package build error when apparently the INDEX is built on     [1]
    a machine with clang while the package is not;
  . remove CPP configuration (it's not used with this port);
  . add "-L${LOCALBASE}/lib -liconv" to LDFLAGS due to the error:
  -----
  [ 86%] Building CXX object src/tests/CMakeFiles/test2-static.dir/test2.cpp.o
  Linking CXX executable test2-static
  /usr/bin/ld: ^^^A: invalid DSO for symbol `libiconv_open' definition
  /usr/local/lib/libiconv.so.3: could not read symbols: Bad value
  -----
  
  PR:		ports/180608  [1]
  Submitted by:	tijl  [1]

Modified:
  head/graphics/oyranos/Makefile
  head/graphics/oyranos/pkg-plist

Modified: head/graphics/oyranos/Makefile
==============================================================================
--- head/graphics/oyranos/Makefile	Wed Aug  7 09:35:04 2013	(r324337)
+++ head/graphics/oyranos/Makefile	Wed Aug  7 10:10:06 2013	(r324338)
@@ -32,20 +32,20 @@ USE_GNOME=	libxml2
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 USE_XORG=	xfixes xinerama xrandr xxf86vm
 CMAKE_ARGS+=	-DXDG_CONFIG_DIR=${PREFIX}/etc/xdg
+LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 
 MAN1=		oyranos-config-fltk.1 oyranos-monitor-daemon.1 oyranos-monitor.1 \
 		oyranos-policy.1 oyranos-profile-graph.1 oyranos-profile-install.1 \
 		oyranos-profile.1 oyranos-profiles.1 oyranos-xforms-modules.1 qcmsevents.1
 MAN3=		oyranos-config.3 oyranos.3
 
-.if exists(/usr/bin/clang)
+.include <bsd.port.pre.mk>
+
+.if exists(/usr/bin/clang) && ${OSVERSION} > 901502
 CC=		/usr/bin/clang
-CPP=		/usr/bin/clang-cpp
 CXX=		/usr/bin/clang++
-CONFIGURE_ENV+=	CXXCPP="${CPP}"
 .else
 USE_GCC=	4.6+
-CONFIGURE_ENV+=	CXXCPP="${CPP}"
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/graphics/oyranos/pkg-plist
==============================================================================
--- head/graphics/oyranos/pkg-plist	Wed Aug  7 09:35:04 2013	(r324337)
+++ head/graphics/oyranos/pkg-plist	Wed Aug  7 10:10:06 2013	(r324338)
@@ -532,12 +532,15 @@ share/pixmaps/qcmsevents.svg
 %%DOCSDIR%%/html/unionoyValue__u__coll__graph.png
 @dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
-@dirrmtry share/color/settings
 @dirrmtry share/applications
+@dirrmtry share/color/settings
+@dirrmtry share/color
 @dirrmtry lib/pkgconfig
 @dirrm lib/oyranos/cmake
 @dirrm lib/oyranos
 @dirrmtry lib/colour/modules
 @dirrmtry lib/colour
+@comment @dirrmtry etc/xdg/autostart
+@comment @dirrmtry etc/xdg
 @dirrm include/oyranos/alpha
 @dirrm include/oyranos
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Boris Samorodov freebsd_committer 2013-08-07 11:10:49 UTC
State Changed
From-To: open->closed

Committed, thanks!