ports/149127: [PATCH] net/beacon: allow compilation on non-i386 architectures
Craig Leres
leres at ee.lbl.gov
Sat Jul 31 05:30:03 UTC 2010
>Number: 149127
>Category: ports
>Synopsis: [PATCH] net/beacon: allow compilation on non-i386 architectures
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 31 05:30:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Craig Leres
>Release: FreeBSD 7.2-RELEASE amd64
>Organization:
Lawrence Berkeley National Laboratory
>Environment:
FreeBSD hot.lbl.gov 7.2-RELEASE FreeBSD 7.2-RELEASE #19: Thu Jul 29
12:51:28 PDT 2010
leres at hot.ee.lbl.gov:/usr/src/7.2-RELEASE/sys/amd64/compile/LBLSMPIPV6
amd64
>Description:
The beacon port is marked "Does not compile on !i386" due to
two minor issues. One is that -fPIC is needed for most of the
modules. The other is that an include file that defines a
prototype for inet_ntop() that conflicts with the system version
(and actually is not needed).
>How-To-Repeat:
>Fix:
Attached is a patch for the port Makefile and three new patch
files. The Makefile and two Makefile.in patches are straightforward
but the last patch is a patch to the patch for the common tree
that gets unpacked during configure. It adds ifdef's to the
include of inet_ntop.h.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkxTdzEACgkQWxlAhAje3Ju/OgCbBDdQK1UxRwIo6CcpofsLYvNx
CB0AnionLidVE+YmuvNxzFge+vFgU5a1
=NB5N
-----END PGP SIGNATURE-----
--------------050201040608000503060109
Content-Type: text/plain;
name="patch-Makefile"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-Makefile"
--- Makefile.orig 2010-07-30 17:52:23.000000000 -0700
+++ Makefile 2010-07-30 17:52:49.000000000 -0700
@@ -7,7 +7,7 @@
PORTNAME= beacon
PORTVERSION= 1.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net perl5 mbone ipv6
MASTER_SITES= http://dast.nlanr.net/Projects/Beacon/releases/
DISTNAME= ${PORTNAME}-${PORTVERSION}
@@ -35,10 +35,6 @@
.include <bsd.port.pre.mk>
-.if ${ARCH} != "i386"
-BROKEN= Does not compile on !i386
-.endif
-
post-install:
@${ECHO} "Sample config installed at \
${PREFIX}/etc/beacon.conf.sample"
--------------050201040608000503060109
Content-Type: text/plain;
name="patch-files-patch-Makefile.in"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-files-patch-Makefile.in"
--- /dev/null 2010-07-30 17:38:36.000000000 -0700
+++ files/patch-Makefile.in 2010-07-30 17:38:13.000000000 -0700
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2005-08-26 13:22:44.000000000 -0700
++++ Makefile.in 2010-07-30 17:37:58.000000000 -0700
+@@ -45,7 +45,7 @@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC -DHAVE_INET_NTOP
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
--------------050201040608000503060109
Content-Type: text/plain;
name="patch-files-patch-libbeacon-Makefile.in"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-files-patch-libbeacon-Makefile.in"
--- /dev/null 2010-07-30 17:38:36.000000000 -0700
+++ files/patch-libbeacon-Makefile.in 2010-07-30 17:14:39.000000000 -0700
@@ -0,0 +1,11 @@
+--- libbeacon/Makefile.in.orig 2010-07-30 17:13:05.000000000 -0700
++++ libbeacon/Makefile.in 2010-07-30 17:13:12.000000000 -0700
+@@ -45,7 +45,7 @@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
--------------050201040608000503060109
Content-Type: text/plain;
name="patch-files-patch-common-beacon.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="patch-files-patch-common-beacon.patch"
--- /dev/null 2010-07-30 17:38:36.000000000 -0700
+++ files/patch-common-beacon.patch 2010-07-30 17:35:17.000000000 -0700
@@ -0,0 +1,18 @@
+--- common-beacon.patch.orig 2005-06-15 18:46:40.000000000 -0700
++++ common-beacon.patch 2010-07-30 17:34:45.000000000 -0700
+@@ -46,3 +46,15 @@
+
+ #if !defined(WORDS_BIGENDIAN) && !defined(WORDS_SMALLENDIAN)
+ #error RTP library requires WORDS_BIGENDIAN or WORDS_SMALLENDIAN to be defined.
++--- common/src/net_udp.c 2004-06-29 09:21:37.000000000 -0700
+++++ common-beacon/src/net_udp.c 2010-07-30 17:28:06.000000000 -0700
++@@ -44,7 +44,9 @@
++ #include "debug.h"
++ #include "memory.h"
++ #include "inet_pton.h"
+++#ifndef HAVE_INET_NTOP
++ #include "inet_ntop.h"
+++#endif
++ #include "vsnprintf.h"
++ #include "net_udp.h"
++
--------------050201040608000503060109
Content-Type: application/octet-stream;
name="patch-Makefile.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="patch-Makefile.sig"
iEYEABECAAYFAkxTdzEACgkQWxlAhAje3JupsQCff7fPlBgRF4LRHpM3Hi2gnTurC1MAmwTR
edsGqoFvlnFC2LoBJC8Q7+7G
--------------050201040608000503060109
Content-Type: application/octet-stream;
name="patch-files-patch-Makefile.in.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="patch-files-patch-Makefile.in.sig"
iEYEABECAAYFAkxTdzEACgkQWxlAhAje3Jsv7gCfVTOMVV8L7Ge3c+SCoVf/tw9WFIwAnApB
AqoDlRbueOonVU0vWifwrrDy
--------------050201040608000503060109
Content-Type: application/octet-stream;
name="patch-files-patch-libbeacon-Makefile.in.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="patch-files-patch-libbeacon-Makefile.in.sig"
iEYEABECAAYFAkxTdzEACgkQWxlAhAje3Jsl9ACbBM16drKpC0/4ez3MVowGgmXiG7oAniz1
jR1dFcvirKn3TQSA7vDX28vD
--------------050201040608000503060109
Content-Type: application/octet-stream;
name="patch-files-patch-common-beacon.patch.sig"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="patch-files-patch-common-beacon.patch.sig"
iEYEABECAAYFAkxTdzEACgkQWxlAhAje3Jt21wCdHTaN6bJ20tvbVfvZdIpfhjxCNT0AnAhv
wt84psErd20p2x3aOcDIebrA
--------------050201040608000503060109--
>Release-Note:
>Audit-Trail:
>Unformatted:
This is a multi-part message in MIME format.
--------------050201040608000503060109
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
More information about the freebsd-ports-bugs
mailing list