Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jul 2018 14:17:26 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r475017 - in head/mail/qmail-dk: . files
Message-ID:  <201807201417.w6KEHQq0097352@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Fri Jul 20 14:17:26 2018
New Revision: 475017
URL: https://svnweb.freebsd.org/changeset/ports/475017

Log:
  mail/qmail-dk: Fix build with lld
  
  /usr/bin/ld: error: duplicate symbol: scan_ulong
  >>> defined at scan_ulong.c
  >>>            scan_ulong.o:(scan_ulong) in archive fs.a
  >>> defined at scan_ulong.c
  >>>            scan_ulong.o:(.text+0x0)
  
  http://beefy12.nyi.freebsd.org/data/head-amd64-default/p474767_s336359/logs/qmail-dk-0.54_1.log
  
  scan_ulong.o is added to fs.a and appears twice in the link command
  line (via fs.a and listed explicitly) which results in a duplicate
  symbol error with lld.  Removing scan_ulong.o from the link command
  line would result in an undefined reference error when linking
  auto-int with ld.bfd, so remove it from fs.a instead.
  
  Attempt to build on aarch64 again as the error message is the same.
  
  PR:		221812
  Reported by:	emaste, pkg-fallout

Added:
  head/mail/qmail-dk/files/
  head/mail/qmail-dk/files/patch-Makefile   (contents, props changed)
Modified:
  head/mail/qmail-dk/Makefile

Modified: head/mail/qmail-dk/Makefile
==============================================================================
--- head/mail/qmail-dk/Makefile	Fri Jul 20 14:08:06 2018	(r475016)
+++ head/mail/qmail-dk/Makefile	Fri Jul 20 14:17:26 2018	(r475017)
@@ -12,8 +12,6 @@ DIST_SUBDIR=	qmail
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DomainKeys implementation for qmail
 
-BROKEN_aarch64=		fails to link: scan_ulong.c:(.text+0x0): duplicate symbol 'scan_ulong'
-
 LIB_DEPENDS+=	libdomainkeys.so:mail/libdomainkeys
 
 PATCH_SITES=	QMAIL

Added: head/mail/qmail-dk/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/qmail-dk/files/patch-Makefile	Fri Jul 20 14:17:26 2018	(r475017)
@@ -0,0 +1,31 @@
+/usr/bin/ld: error: duplicate symbol: scan_ulong
+	>>> defined at scan_ulong.c
+	>>>            scan_ulong.o:(scan_ulong) in archive fs.a
+	>>> defined at scan_ulong.c
+	>>>            scan_ulong.o:(.text+0x0)
+
+--- Makefile.orig	2018-07-20 14:10:56 UTC
++++ Makefile
+@@ -37,8 +37,8 @@ scan.h fmt.h
+ 	./compile auto-gid.c
+ 
+ auto-int: \
+-load auto-int.o substdio.a error.a str.a fs.a
+-	./load auto-int substdio.a error.a str.a fs.a 
++load auto-int.o substdio.a error.a str.a fs.a scan_ulong.o
++	./load auto-int substdio.a error.a str.a fs.a scan_ulong.o
+ 
+ auto-int.o: \
+ compile auto-int.c substdio.h readwrite.h exit.h scan.h fmt.h
+@@ -609,9 +609,9 @@ strerr.h substdio.h fmt.h
+ 
+ fs.a: \
+ makelib fmt_str.o fmt_strn.o fmt_uint.o fmt_uint0.o fmt_ulong.o \
+-scan_ulong.o scan_8long.o
++scan_8long.o
+ 	./makelib fs.a fmt_str.o fmt_strn.o fmt_uint.o fmt_uint0.o \
+-	fmt_ulong.o scan_ulong.o scan_8long.o
++	fmt_ulong.o scan_8long.o
+ 
+ getln.a: \
+ makelib getln.o getln2.o



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807201417.w6KEHQq0097352>