cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For x11/wxWidgets, avoid using '-Wl,--version-script'.

Browse Source 
When used in conjunction with PIE, symbol versioning triggers weird
linking problems in dependent ports.
This appears to unbreak graphics/hugin.
Bump all the majors of wx shared libraries and amend graphics/hugin
accordingly.

Kudos to naddy@: a 2009 message to misc@ from him put me on the
right track.

OK sthen@ (MAINTAINER)
This commit is contained in:
dcoppa 2012-11-06 09:37:14 +00:00
parent 2e37bf8112
commit 8bae10bc8f
2 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
graphics/hugin/Makefile
View File

@ -1,10 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2012/11/05 11:15:11 sthen Exp $
# can't build with PIE, can't build either hugin or wxWidgets with
# CFLAGS+=-fno-pie LDFLAGS+=-nopie
.for i in alpha amd64 hppa mips64 mips64el sh sparc64
BROKEN-$i = hugin or possibly wxWidgets is broken with PIE
.endfor
# $OpenBSD: Makefile,v 1.30 2012/11/06 09:37:14 dcoppa Exp $
VMEM_WARNING = Yes
SHARED_ONLY = Yes
@ -13,6 +7,7 @@ COMMENT = panorama image stitcher
DISTNAME = hugin-2011.4.0
EXTRACT_SUFX = .tar.bz2
REVISION = 0
TAR = ${LOCALBASE}/bin/gtar
BUILD_DEPENDS += archivers/gtar
@ -45,9 +40,10 @@ WANTLIB += GL GLEW GLU Half Iex Imath IlmImf IlmThread ICE SM X11
WANTLIB += Xext Xi Xmu boost_date_time-mt boost_filesystem-mt
WANTLIB += boost_iostreams-mt boost_regex-mt boost_signals-mt
WANTLIB += boost_system-mt boost_thread-mt c exiv2 glut>=4.1
WANTLIB += jpeg m pano13>=2.0 png pthread stdc++ tiff wx_base
WANTLIB += wx_base_net wx_base_xml wx_gtk2_adv wx_gtk2_aui
WANTLIB += wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_xrc z
WANTLIB += jpeg m pano13>=2.0 png pthread stdc++ tiff
WANTLIB += wx_base>=3 wx_base_net>=3 wx_base_xml>=3
WANTLIB += wx_gtk2_adv>=3 wx_gtk2_aui>=3 wx_gtk2_core>=3
WANTLIB += wx_gtk2_gl>=3 wx_gtk2_html>=3 wx_gtk2_xrc>=3 z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/}
@ -65,7 +61,7 @@ LIB_DEPENDS = devel/boost \
graphics/openexr \
graphics/png \
graphics/tiff \
x11/wxWidgets>=2.7
x11/wxWidgets>=2.8.12p7
BUILD_DEPENDS += devel/tclap
USE_GROFF = Yes
@ -73,8 +69,9 @@ MODULES += devel/cmake
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = cmake
CONFIGURE_ENV = MANDIR=man
CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:STRING=Release
NO_REGRESS = Yes
CFLAGS += -pthread -fno-pie -fPIC
CFLAGS += -pthread
LDFLAGS += -L${X11BASE}/lib
pre-patch:

52
x11/wxWidgets/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2012/09/06 12:38:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.43 2012/11/06 09:37:14 dcoppa Exp $
SHARED_ONLY = Yes
@ -9,32 +9,32 @@ V = 2.8.12
DISTNAME = wxWidgets-${V}
PKGNAME-main = wxWidgets-gtk2-${V}
PKGNAME-media = wxWidgets-media-${V}
REVISION-main = 6
REVISION-media =2
REVISION-main = 7
REVISION-media =3
CATEGORIES = x11
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=wxwindows/}
SHARED_LIBS = wx_base 2.1 \
wx_base_net 2.1 \
wx_base_odbc 2.1 \
wx_base_xml 2.1 \
wx_gtk2_adv 2.1 \
wx_gtk2_aui 2.1 \
wx_gtk2_core 2.1 \
wx_gtk2_dbgrid 2.1 \
wx_gtk2_fl 2.1 \
wx_gtk2_gizmos 2.1 \
wx_gtk2_gizmos_xrc 2.1 \
wx_gtk2_gl 2.1 \
wx_gtk2_html 2.1 \
wx_gtk2_media 2.1 \
wx_gtk2_ogl 2.1 \
wx_gtk2_plot 2.1 \
wx_gtk2_qa 2.1 \
wx_gtk2_richtext 2.1 \
wx_gtk2_stc 2.1 \
wx_gtk2_svg 2.1 \
wx_gtk2_xrc 2.1
SHARED_LIBS = wx_base 3.0 \
wx_base_net 3.0 \
wx_base_odbc 3.0 \
wx_base_xml 3.0 \
wx_gtk2_adv 3.0 \
wx_gtk2_aui 3.0 \
wx_gtk2_core 3.0 \
wx_gtk2_dbgrid 3.0 \
wx_gtk2_fl 3.0 \
wx_gtk2_gizmos 3.0 \
wx_gtk2_gizmos_xrc 3.0 \
wx_gtk2_gl 3.0 \
wx_gtk2_html 3.0 \
wx_gtk2_media 3.0 \
wx_gtk2_ogl 3.0 \
wx_gtk2_plot 3.0 \
wx_gtk2_qa 3.0 \
wx_gtk2_richtext 3.0 \
wx_gtk2_stc 3.0 \
wx_gtk2_svg 3.0 \
wx_gtk2_xrc 3.0
HOMEPAGE = http://www.wxwidgets.org/
@ -95,6 +95,10 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
ac_cv_lib_esd_esd_close=no
# XXX: When used in conjunction with PIE, symbol versioning triggers
# weird linking problems in dependent ports
CONFIGURE_ENV += wx_cv_version_script=no
.ifdef DEBUG
CONFIGURE_ARGS += --enable-debug
.endif