Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 May 2014 15:49:51 +0000 (UTC)
From:      Raphael Kubo da Costa <rakuco@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352922 - in head/databases/qdbm: . files
Message-ID:  <201405031549.s43Fnplf027828@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rakuco
Date: Sat May  3 15:49:51 2014
New Revision: 352922
URL: http://svnweb.freebsd.org/changeset/ports/352922
QAT: https://qat.redports.org/buildarchive/r352922/

Log:
  Prevent the port from hardcoding its own CFLAGS/CXXFLAGS.
  
  This should fix the build with clang 3.4, which refuses to accept options
  such as -fforce-addr and -fno-force-addr.
  
  While here, update the port's website in pkg-descr as well.
  
  MFH:		2014Q2

Added:
  head/databases/qdbm/files/patch-java__Makefile.in   (contents, props changed)
  head/databases/qdbm/files/patch-plus__Makefile.in   (contents, props changed)
Modified:
  head/databases/qdbm/Makefile
  head/databases/qdbm/files/patch-Makefile.in
  head/databases/qdbm/pkg-descr

Modified: head/databases/qdbm/Makefile
==============================================================================
--- head/databases/qdbm/Makefile	Sat May  3 15:45:25 2014	(r352921)
+++ head/databases/qdbm/Makefile	Sat May  3 15:49:51 2014	(r352922)
@@ -4,6 +4,7 @@
 
 PORTNAME=	qdbm
 PORTVERSION=	1.8.78
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://fallabs.com/qdbm/
 
@@ -12,6 +13,7 @@ COMMENT?=	Quick Database Manager
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+CFLAGS+=	-fPIC
 
 .if !defined(SLAVEPORT)
 USES+=		iconv

Modified: head/databases/qdbm/files/patch-Makefile.in
==============================================================================
--- head/databases/qdbm/files/patch-Makefile.in	Sat May  3 15:45:25 2014	(r352921)
+++ head/databases/qdbm/files/patch-Makefile.in	Sat May  3 15:49:51 2014	(r352922)
@@ -1,11 +1,30 @@
---- Makefile.in.orig    Wed Feb 21 16:44:56 2007
-+++ Makefile.in Sun Jul  8 18:19:52 2007
-@@ -169,8 +169,10 @@
-	cd $(srcdir)/man && cp -Rf $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR)
-	mkdir -p $(DESTDIR)$(MYMAN3DIR)
-	cd $(srcdir)/man && cp -Rf $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR)
+--- Makefile.in.orig	2010-08-04 20:14:34.000000000 +0300
++++ Makefile.in	2014-05-03 18:41:01.000000000 +0300
+@@ -46,7 +46,7 @@
+ MYMAN1DIR = @mandir@/man1
+ MYMAN3DIR = @mandir@/man3
+ MYDATADIR = @datadir@/$(PACKAGE)
+-MYPCDIR = @libdir@/pkgconfig
++MYPCDIR = /usr/local/libdata/pkgconfig
+ DESTDIR =
+ 
+ # Building binaries
+@@ -56,7 +56,6 @@
+   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+@@ -170,8 +169,10 @@
+ 	cd $(srcdir)/man && cp -Rf $(MYMAN1S) $(DESTDIR)$(MYMAN1DIR)
+ 	mkdir -p $(DESTDIR)$(MYMAN3DIR)
+ 	cd $(srcdir)/man && cp -Rf $(MYMAN3S) $(DESTDIR)$(MYMAN3DIR)
 +.if $(MYDOCS) != ""
-	mkdir -p $(DESTDIR)$(MYDATADIR)
-	cd $(srcdir) && cp -Rf $(MYDOCS) $(DESTDIR)$(MYDATADIR)
+ 	mkdir -p $(DESTDIR)$(MYDATADIR)
+ 	cd $(srcdir) && cp -Rf $(MYDOCS) $(DESTDIR)$(MYDATADIR)
 +.endif
-	mkdir -p $(DESTDIR)$(MYPCDIR)
+ 	mkdir -p $(DESTDIR)$(MYPCDIR)
+ 	cd $(srcdir) && cp -Rf $(MYPCS) $(DESTDIR)$(MYPCDIR)
+ 	@printf '\n'

Added: head/databases/qdbm/files/patch-java__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/qdbm/files/patch-java__Makefile.in	Sat May  3 15:49:51 2014	(r352922)
@@ -0,0 +1,10 @@
+--- java/Makefile.in.orig	2014-05-03 18:41:15.000000000 +0300
++++ java/Makefile.in	2014-05-03 18:41:21.000000000 +0300
+@@ -56,7 +56,6 @@
+   @MYDEFS@ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -fPIC -fsigned-char -O2 @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)

Added: head/databases/qdbm/files/patch-plus__Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/qdbm/files/patch-plus__Makefile.in	Sat May  3 15:49:51 2014	(r352922)
@@ -0,0 +1,10 @@
+--- plus/Makefile.in.orig	2014-05-03 18:41:29.000000000 +0300
++++ plus/Makefile.in	2014-05-03 18:41:32.000000000 +0300
+@@ -44,7 +44,6 @@
+   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
+ LD = @LD@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \

Modified: head/databases/qdbm/pkg-descr
==============================================================================
--- head/databases/qdbm/pkg-descr	Sat May  3 15:45:25 2014	(r352921)
+++ head/databases/qdbm/pkg-descr	Sat May  3 15:49:51 2014	(r352922)
@@ -5,4 +5,4 @@ Both binary data and character string ca
 value.  There is neither concept of data tables nor data types.
 Records are organized in hash table or B+ tree.
 
-WWW: http://qdbm.sourceforge.net/
+WWW: http://fallabs.com/qdbm/



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