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

Properly link against libintl, unbreak Xaw detection

Browse Source 
Reported by kevlo@ (who came up with a different diff), ok Eric Brown (maintainer)
This commit is contained in:
jca 2019-04-19 13:58:47 +00:00
parent 3141052b9f
commit f58f547ca4
3 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
misc/m17n/lib/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2019/03/28 02:03:27 jca Exp $
# $OpenBSD: Makefile,v 1.3 2019/04/19 13:58:47 jca Exp $
COMMENT = multilingual text processing library
DISTNAME = m17n-lib-${M17N_V}
REVISION = 0
SHARED_LIBS += m17n-core 0.0 # 4.2
SHARED_LIBS += m17n 0.0 # 4.2
@ -11,11 +12,13 @@ SHARED_LIBS += m17n-gui 0.0 # 4.2
CATEGORIES = misc
WANTLIB += ICE SM X11 Xft Xrender Xt anthy anthydic c expat fontconfig
WANTLIB += freetype fribidi gd iconv jpeg lzma m otf png16 pthread
WANTLIB += tiff webp xcb xml2 z
WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xft Xmu Xpm Xrender Xt
WANTLIB += anthy anthydic c expat fontconfig freetype fribidi
WANTLIB += gd iconv intl jpeg lzma m otf png16 pthread tiff webp
WANTLIB += xcb xml2 z
LIB_DEPENDS = devel/libotf \
LIB_DEPENDS = devel/gettext \
devel/libotf \
devel/fribidi \
graphics/gd \
inputmethods/anthy \
@ -25,7 +28,8 @@ BUILD_DEPENDS = textproc/ispell \
${RUN_DEPENDS}
RUN_DEPENDS = misc/m17n/db=${M17N_V}
CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib ${LDFLAGS}"
LIBTOOL_FLAGS = --tag=disable-static
SEPARATE_BUILD = Yes

4
misc/m17n/lib/patches/patch-example_Makefile_in
View File

@ -1,4 +1,6 @@
$OpenBSD: patch-example_Makefile_in,v 1.1.1.1 2019/03/26 16:46:59 sthen Exp $
$OpenBSD: patch-example_Makefile_in,v 1.2 2019/04/19 13:58:47 jca Exp $
- don't hardcode libdl
Index: example/Makefile.in
--- example/Makefile.in.orig

26
misc/m17n/lib/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2019/04/19 13:58:47 jca Exp $
- fix portable linking with libintl, see info '(gettext) src/Makefile'
- don't hardcode libdl
Index: src/Makefile.in
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -566,7 +566,7 @@ libm17n_core_la_SOURCES = \
textprop.h textprop.c \
mtext-lbrk.c mtext-wseg.c
-libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@
+libm17n_core_la_LIBADD = @XML2_LD_FLAGS@ @THAI_WORDSEG_LD_FLAGS@ @LTLIBINTL@
libm17n_core_la_LDFLAGS = -export-dynamic ${VINFO}
libm17n_la_SOURCES = \
charset.h charset.c \
@@ -576,7 +576,7 @@ libm17n_la_SOURCES = \
mlocale.h locale.c \
m17n.h m17n.c
-libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl
+libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la
libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
FLT_SOURCES = \
internal-flt.h \