Date: Wed, 5 May 2010 07:11:57 GMT From: Anders F Björklund <afb@rpm5.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/146321: [patch] misc/ossp-uuid headers conflicts with system Message-ID: <201005050711.o457Bv5I059099@www.freebsd.org> Resent-Message-ID: <201005050720.o457K23H019265@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 146321
>Category: ports
>Synopsis: [patch] misc/ossp-uuid headers conflicts with system
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 05 07:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Anders F Björklund
>Release: 7.3-RELEASE
>Organization:
>Environment:
>Description:
ossp-uuid-1.6.2_1 breaks libSM-1.1.1_1 build
sm_genid.c: In function 'SmsGenerateClientID':
sm_genid.c:92: error: storage size of 'uuid' isn't known
sm_genid.c:95: error: too many arguments to function 'uuid_create'
sm_genid.c:97: warning: implicit declaration of function 'uuid_to_string'
sm_genid.c:97: warning: nested extern declaration of 'uuid_to_string'
sm_genid.c:99: warning: passing argument 1 of 'strlen' from incompatible pointer type
sm_genid.c:102: warning: passing argument 2 of 'strcpy' from incompatible pointer type
sm_genid.c:92: warning: unused variable 'uuid'
i.e. it's getting the wrong file with #include <uuid.h>
/usr/local/include/uuid.h versus /usr/include/uuid.h
>How-To-Repeat:
install misc/ossp-uuid, build x11/libSM
>Fix:
Suggestion is to move the ossp-uuid headers to a "ossp" subdirectory.
Pkg-config will have library users pick this change up automatically.
Patch attached with submission follows:
diff -uNr /usr/ports/misc/ossp-uuid/Makefile ossp-uuid/Makefile
--- /usr/ports/misc/ossp-uuid/Makefile 2009-07-29 09:34:44.000000000 +0200
+++ ossp-uuid/Makefile 2010-05-04 22:58:33.000000000 +0200
@@ -7,7 +7,7 @@
PORTNAME= uuid
PORTVERSION= 1.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc devel
MASTER_SITES= ${MASTER_SITE_OSSP}
MASTER_SITE_SUBDIR= lib/${PORTNAME}
diff -uNr /usr/ports/misc/ossp-uuid/files/patch-includedir.diff ossp-uuid/files/patch-includedir.diff
--- /usr/ports/misc/ossp-uuid/files/patch-includedir.diff 1970-01-01 01:00:00.000000000 +0100
+++ ossp-uuid/files/patch-includedir.diff 2010-05-04 23:03:37.000000000 +0200
@@ -0,0 +1,69 @@
+--- ./Makefile.in.ossp 2010-05-04 22:54:24.000000000 +0200
++++ ./Makefile.in 2010-05-04 22:57:51.000000000 +0200
+@@ -225,21 +225,21 @@ check: all
+ install:
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
+- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)
++ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)/ossp
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)/libdata/pkgconfig
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
+ $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
+ $(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
+ $(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/
+- $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
++ $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/ossp/
+ -@if [ ".$(WITH_DCE)" = .yes ]; then \
+- echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
+- $(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/; \
++ echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/ossp/"; \
++ $(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/ossp/; \
+ fi
+ -@if [ ".$(WITH_CXX)" = .yes ]; then \
+- echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
+- $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
++ echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/ossp/"; \
++ $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/ossp/; \
+ fi
+ $(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
+ -@if [ ".$(WITH_CXX)" = .yes ]; then \
+@@ -281,14 +281,14 @@ uninstall:
+ echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \
+ $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \
+ fi
+- -$(RM) $(DESTDIR)$(includedir)/uuid.h
++ -$(RM) $(DESTDIR)$(includedir)/ossp/uuid.h
+ -@if [ ".$(WITH_DCE)" = .yes ]; then \
+- echo "$(RM) $(DESTDIR)$(includedir)/uuid_dce.h"; \
+- $(RM) $(DESTDIR)$(includedir)/uuid_dce.h; \
++ echo "$(RM) $(DESTDIR)$(includedir)/ossp/uuid_dce.h"; \
++ $(RM) $(DESTDIR)$(includedir)/ossp/uuid_dce.h; \
+ fi
+ -@if [ ".$(WITH_CXX)" = .yes ]; then \
+- echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
+- $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
++ echo "$(RM) $(DESTDIR)$(includedir)/ossp/uuid++.hh"; \
++ $(RM) $(DESTDIR)$(includedir)/ossp/uuid++.hh; \
+ fi
+ -$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+ -$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
+@@ -298,6 +298,7 @@ uninstall:
+ -$(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
+ -$(RMDIR) $(DESTDIR)$(libdir)/pkgconfig >/dev/null 2>&1 || $(TRUE)
+ -$(RMDIR) $(DESTDIR)$(libdir) >/dev/null 2>&1 || $(TRUE)
++ -$(RMDIR) $(DESTDIR)$(includedir)/ossp >/dev/null 2>&1 || $(TRUE)
+ -$(RMDIR) $(DESTDIR)$(includedir) >/dev/null 2>&1 || $(TRUE)
+ -$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE)
+ -$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
+--- ./uuid.pc.in.ossp 2008-03-07 11:49:59.000000000 +0100
++++ ./uuid.pc.in 2010-05-04 22:56:07.000000000 +0200
+@@ -36,7 +36,7 @@
+ Description: Universally Unique Identifier (UUID) Library
+ Version: @UUID_VERSION_RAW@
+ URL: http://www.ossp.org/pkg/lib/uuid/
+-Cflags: -I${includedir}
++Cflags: -I${includedir}/ossp
+ Libs: -L${libdir} -luuid
+ Libs.private: @LIBS@
+
diff -uNr /usr/ports/misc/ossp-uuid/pkg-plist ossp-uuid/pkg-plist
--- /usr/ports/misc/ossp-uuid/pkg-plist 2007-12-12 16:06:11.000000000 +0100
+++ ossp-uuid/pkg-plist 2010-05-04 22:58:49.000000000 +0200
@@ -1,7 +1,7 @@
bin/uuid
bin/uuid-config
-include/uuid.h
-include/uuid++.hh
+include/ossp/uuid.h
+include/ossp/uuid++.hh
lib/libuuid.a
lib/libuuid++.a
lib/libuuid++.la
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005050711.o457Bv5I059099>