On 2018/12/09 10:47, Matthias Kilian wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: k...@cvs.openbsd.org 2018/12/09 10:47:46
>
> Modified files:
> print/poppler : Makefile distinfo
> print/poppler/patches: patch-poppler_Form_cc
> patch-poppler_XRef_cc
> print/poppler/pkg: PLIST-main PLIST-qt4 PLIST-qt5
> Removed files:
> print/poppler/patches: patch-qt5_src_Makefile_in
>
> Log message:
> Update to poppler-0.61.1.
>
> This is the last version containing qt4 bindings.
> Update to 0.72 will happen when I've fixed build
> problems of qt4 bindings from 0.61.1 with newer
> versions of poppler.
>
> No fallout during a bulk update on amd64. I've tested
> some programs depending on it (evince, gummi).
>
> ok aja@
>
Unfortunately broken on non-LLD arches. To replicate on amd64 you can
apply the bsd.port.mk diff below and build with USE_LLD=No.
g-ir-scanner: link: cc -o
/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap/gli
b/tmp-introspecti45w5mf0/Poppler-0.18 -O2 -pipe
/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt
4-no_qt5-bootstrap/glib/tmp-introspecti45w5mf0/Poppler-0.18.o -L. -Wl,-rpath,.
-Wl,--no-as-needed -lpoppler-glib -L/us
r/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap
-Wl,-rpath,/usr/obj/ports/popple
r-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap
-L/usr/local/lib -Wl,-E -pthread -lgio-2.0 -lgobje
ct-2.0 -lgmodule-2.0 -lglib-2.0 -lintl
/usr/local/lib/libglib-2.0.so.4201.0: warning: stpcpy() is dangerous; do not
use it
/usr/local/lib/libglib-2.0.so.4201.0: warning: sprintf() is often misused,
please use snprintf()
/usr/local/lib/libglib-2.0.so.4201.0: warning: vsprintf() is often misused,
please use vsnprintf()
/usr/local/lib/libgobject-2.0.so.4200.7: warning: strcat() is almost always
misused, please use strlcat()
/usr/local/lib/libgio-2.0.so.4200.7: warning: strcpy() is almost always
misused, please use strlcpy()
/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap/libpoppler.so.46.0:
warning: rand_r() is not random, it is deterministic.
/usr/local/lib/libcairo.so.13.0: warning: rand() may return deterministic
values, is that what you want?
/usr/bin/ld: warning: libfreetype.so.29.0, needed by ./libpoppler-glib.so.18.0,
not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libfontconfig.so.12.0, needed by
/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap/libpoppler.so.46.0,
not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libpixman-1.so.32.6, needed by
/usr/local/lib/libcairo.so.13.0, not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libxcb-shm.so.1.1, needed by
/usr/local/lib/libcairo.so.13.0, not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libxcb.so.4.0, needed by /usr/local/lib/libcairo.so.13.0,
not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libXau.so.10.0, needed by
/usr/local/lib/libcairo.so.13.0, not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libXdmcp.so.11.0, needed by
/usr/local/lib/libcairo.so.13.0, not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libxcb-render.so.1.1, needed by
/usr/local/lib/libcairo.so.13.0, not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libXrender.so.6.0, needed by
/usr/local/lib/libcairo.so.13.0, not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libX11.so.16.1, needed by
/usr/local/lib/libcairo.so.13.0, not found (try using -rpath or -rpath-link)
/usr/bin/ld: warning: libXext.so.13.0, needed by
/usr/local/lib/libcairo.so.13.0, not found (try using -rpath or -rpath-link)
/usr/local/lib/libcairo.so.13.0: undefined reference to `XFreePixmap'
/usr/local/lib/libcairo.so.13.0: undefined reference to
`xcb_create_pixmap_checked'
/usr/local/lib/libcairo.so.13.0: undefined reference to `pixman_image_ref'
/usr/local/lib/libcairo.so.13.0: undefined reference to
`xcb_render_pictscreen_next'
/usr/local/lib/libcairo.so.13.0: undefined reference to
`xcb_render_pictvisual_next'
/usr/local/lib/libcairo.so.13.0: undefined reference to `xcb_render_id'
/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap/libpoppler.so.46.0:
undefined reference to `FcPatternAddInteger'
/usr/local/lib/libcairo.so.13.0: undefined reference to `xcb_shm_attach_checked'
/usr/local/lib/libcairo.so.13.0: undefined reference to `XShmGetImage'
/usr/local/lib/libcairo.so.13.0: undefined reference to
`pixman_image_get_stride'
>> [...snip...] <<
/usr/local/lib/libcairo.so.13.0: undefined reference to
`xcb_screen_allowed_depths_iterator'
/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap/libpoppler.so.46.0:
undefined reference to `FcFontSetDestroy'
/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap/libpoppler.so.46.0:
undefined reference to `FcDefaultSubstitute'
cc: error: linker command failed with exit code 1 (use -v to see invocation)
linking of temporary binary failed: Command '['cc', '-o',
'/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap/glib/tmp-introspecti45w5mf0/Poppler-0.18',
'-O2', '-pipe',
'/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap/glib/tmp-introspecti45w5mf0/Poppler-0.18.o',
'-L.', '-Wl,-rpath,.', '-Wl,--no-as-needed', '-lpoppler-glib',
'-L/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap',
'-Wl,-rpath,/usr/obj/ports/poppler-0.61.1-no_qt4-no_qt5-bootstrap/build-i386-no_qt4-no_qt5-bootstrap',
'-L/usr/local/lib', '-Wl,-E', '-pthread', '-lgio-2.0', '-lgobject-2.0',
'-lgmodule-2.0', '-lglib-2.0', '-lintl']' returned non-zero exit status 1.
ninja: build stopped: subcommand failed.
Index: bsd.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1457
diff -u -p -r1.1457 bsd.port.mk
--- bsd.port.mk 25 Nov 2018 11:51:25 -0000 1.1457
+++ bsd.port.mk 10 Dec 2018 15:04:31 -0000
@@ -404,12 +404,6 @@ BASELOCALSTATEDIR ?= ${VARBASE}
LOCALSTATEDIR ?= ${BASELOCALSTATEDIR}
RCDIR ?= /etc/rc.d
-USE_LLD ?= No
-.if ${USE_LLD:L} == "yes"
-_LD_PROGRAM = /usr/bin/ld.lld
-.else
-_LD_PROGRAM = /usr/bin/ld
-.endif
USE_WXNEEDED ?= No
.if ${USE_WXNEEDED:L} == "yes"
_WXNEEDED_FLAGS = -z wxneeded
@@ -809,6 +803,30 @@ CONFIGURE_ENV += ${_EXTRA_ENV}
MAKE_ENV += ${_EXTRA_ENV}
.endif
+.if ${PROPERTIES:Mlld}
+USE_LLD ?= Yes
+.else
+USE_LLD ?= No
+.endif
+
+.if ${USE_LLD:L} == "yes"
+_LD_PROGRAM = /usr/bin/ld.lld
+. if ! ${PROPERTIES:Mlld}
+_NONDEFAULT_LD = Yes
+. endif
+.else
+_LD_PROGRAM = /usr/bin/ld.bfd
+. if ${PROPERTIES:Mlld}
+_NONDEFAULT_LD = Yes
+. endif
+.endif
+
+.if ${_LD_PROGRAM} != ${_LD_DEFAULT}
+_NONDEFAULT_LD = Yes
+.else
+_NONDEFAULT_LD = No
+.endif
+
# setup locations of compilers from the base system or environment variables.
# MODULES for compilers (gcc4.port.mk, clang.port.mk) also append to this,
# used to write wrappers to WRKDIR/bin which is at the head of the PATH.
@@ -2684,7 +2702,7 @@ ${_PATCH_COOKIE}: ${_EXTRACT_COOKIE}
# Run as _pbuild
_post-patch-finalize:
-.if ${USE_WXNEEDED:L} == "yes" || ${USE_LLD:L} == "yes"
+.if ${USE_WXNEEDED:L} == "yes" || ${_NONDEFAULT_LD:L} == "yes"
@wrktmp=`df -P ${WRKOBJDIR_${PKGPATH}} | awk 'END { print $$6 }'`; \
if ! mount | grep -q " $${wrktmp} .*wxallowed"; then \
echo "Fatal: ${WRKOBJDIR_${PKGPATH}} must be on a wxallowed
filesystem" \
