Date: Sun, 1 Jan 2012 16:41:57 GMT From: Jake Smith <jake@xz.cx> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/163753: [MAINTAINER] devel/libk8055: add support for CLANG compiler, fix build on 7.x, support added for PREFIX Message-ID: <201201011641.q01Gfv3O051101@fs.xz.cx> Resent-Message-ID: <201201011650.q01GoAx5058426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163753
>Category: ports
>Synopsis: [MAINTAINER] devel/libk8055: add support for CLANG compiler, fix build on 7.x, support added for PREFIX
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Jan 01 16:50:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jake Smith
>Release: FreeBSD 8.2-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD xxx 8.2-RELEASE FreeBSD 8.2-RELEASE #0 r219081M: Wed Mar 2 08:29:52
>Description:
Fixed compile with CLANG
Fixed broken on 7.x, libusb depend added
Added Custom LOCALBASE and PREFIX for QATty
Will only fallback to gcc if no other compiler is set
Fully tested with redports.org
Added file(s):
- files/patch-Makefile
>How-To-Repeat:
>Fix:
--- libk8055-0.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/libk8055/Makefile /usr/home/jake/redports/export/jake/devel/libk8055/Makefile
--- /usr/ports/devel/libk8055/Makefile 2011-12-08 20:19:29.000000000 +0000
+++ /usr/home/jake/redports/export/jake/devel/libk8055/Makefile 2011-12-31 03:27:04.767185000 +0000
@@ -17,6 +17,7 @@
MAN1= k8055.1
MANCOMPRESSED= yes
USE_LDCONFIG= yes
+USE_CSTD= gnu89
PLIST_FILES= bin/k8055 \
lib/libk8055.c \
@@ -27,8 +28,10 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 800000
-BROKEN= does not compile on FreeBSD 7.X
+.if ${OSVERSION} < 800069
+LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
+CFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.endif
post-patch:
diff -ruN --exclude=CVS /usr/ports/devel/libk8055/files/patch-Makefile /usr/home/jake/redports/export/jake/devel/libk8055/files/patch-Makefile
--- /usr/ports/devel/libk8055/files/patch-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/jake/redports/export/jake/devel/libk8055/files/patch-Makefile 2011-12-31 03:15:57.558476000 +0000
@@ -0,0 +1,47 @@
+--- Makefile.orig 2011-12-31 03:12:14.464658120 +0000
++++ Makefile 2011-12-31 03:12:42.754252842 +0000
+@@ -1,22 +1,22 @@
+-cc = gcc
++CC ?= gcc
+ exec = k8055
+-bindir = /usr/local/bin
+-libdir = /usr/local/lib
+-includedir = /usr/local/include
+-mandir = /usr/local/man/man1
++bindir = ${PREFIX}/bin
++libdir = ${PREFIX}/lib
++includedir = ${PREFIX}/include
++mandir = ${MANPREFIX}/man/man1
+ OBJS = main.o libk8055.o
+ # if your are using Linux comment out next line
+-CFLAGS = -DDAEMON -Wall -D_BSD
++CFLAGS += -DDAEMON -Wall -D_BSD
+ # if you are using Linux incomment following line
+ #CFLAGS = -DDAEMON -Wall
+
+-libs = -lusb -L/usr/lib -lm
++libs = -lusb -L/usr/lib ${LDFLAGS} -lm
+
+ libk8055.so.0.1: libk8055.o
+- $(cc) -Wall -o libk8055.so.0.2 -shared libk8055.o
++ $(CC) -Wall -o libk8055.so.0.2 -shared libk8055.o
+
+ libk8055.o: libk8055.c
+- $(cc) -Wall -O -c -g -fPIC $(CFLAGS) libk8055.c
++ $(CC) -Wall -O -c -g -fPIC $(CFLAGS) libk8055.c
+ -ln -sf libk8055.so.0.2 libk8055.so
+
+ libk8055.c: k8055.h
+@@ -24,10 +24,10 @@
+ all: k8055_prog libk8055.so.0.1
+
+ %.o: %.c
+- $(cc) $(CFLAGS) -c $<
++ $(CC) $(CFLAGS) -c $<
+
+ k8055_prog: $(OBJS)
+- $(cc) $(OBJS) -o $(exec) $(libs)
++ $(CC) $(OBJS) -o $(exec) $(libs)
+ strip $(exec)
+
+ clean:
--- libk8055-0.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201011641.q01Gfv3O051101>