Attachment 76435 Details for Bug 110185 – libhoard-3.6.patch

[patch] libhoard-3.6.patch

libhoard-3.6.patch (text/plain), 7.51 KB, created by trasz on 2007-03-11 10:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: trasz

Created: 2007-03-11 10:40:04 UTC

Size: 7.51 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/libhoard/Makefile /home/trasz/libhoard/Makefile
>--- /usr/ports/devel/libhoard/Makefile	Wed Feb  4 06:19:39 2004
>+++ /home/trasz/libhoard/Makefile	Sun Mar 11 11:40:28 2007
>@@ -6,33 +6,35 @@
> #
> 
> PORTNAME=	libhoard
>-PORTVERSION=	2.1.2d
>-PORTREVISION?=	2
>+PORTVERSION=	3.6
> CATEGORIES=	devel
>-MASTER_SITES=	http://www.cs.umass.edu/~emery/software/
>+MASTER_SITES=	http://www.cs.umass.edu/~emery/hoard/hoard-${PORTVERSION}/
>+DISTNAME=	hoard-36
> 
> MAINTAINER=	osa@FreeBSD.org
> COMMENT=	Fast, scalable and memory-efficient allocator for MP
> 
>-USE_GMAKE=	yes
>-MAKE_ENV=	USE_FREEBSD=1 \
>-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
>-		PTHREAD_LIBS="${PTHREAD_LIBS}"
>-INSTALLS_SHLIB=	YES
>+USE_LDCONFIG=	yes
>+WRKSRC=		${WRKDIR}/${DISTNAME}/src
>+
>+OPTIONS=	OPTIMIZED_CFLAGS "Enable extra optimization options" on
>+ALL_TARGET=	freebsd
>+
>+PLIST_FILES=	lib/libhoard.so lib/libhoard.so.1
> 
> .include <bsd.port.pre.mk>
> 
> .if ${OSVERSION} < 501100
>-IGNORE=		"You must have a FreeBSD 5.1-RELEASE or better"
>+IGNORE=		you must have a FreeBSD 5.1-RELEASE or better
>+.endif
>+
>+.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
>+CFLAGS+=	-march=pentium4 -O3 -finline-limit=20000 -fkeep-inline-functions \
>+		-finline-functions -fomit-frame-pointer -malign-double
> .endif
> 
> do-install:
> 	${INSTALL_DATA} ${WRKSRC}/libhoard.so ${PREFIX}/lib/libhoard.so.1
> 	${LN} -sf ${PREFIX}/lib/libhoard.so.1 ${PREFIX}/lib/libhoard.so
>-.if !defined(NOPORTDOCS)
>-	${INSTALL} -d -m 0755 ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/docs/asplos2000.pdf ${DOCSDIR}
>-.endif
> 
> .include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/devel/libhoard/distinfo /home/trasz/libhoard/distinfo
>--- /usr/ports/devel/libhoard/distinfo	Sun Jan 22 09:28:24 2006
>+++ /home/trasz/libhoard/distinfo	Sun Mar 11 11:40:28 2007
>@@ -1,3 +1,3 @@
>-MD5 (libhoard-2.1.2d.tar.gz) = fd0247f3ec28f507e2eb6b437263fcfe
>-SHA256 (libhoard-2.1.2d.tar.gz) = 975ca2e090fe9454e6fa6548f003e2bd4a98e7452739ce25f566511f7de1ef6e
>-SIZE (libhoard-2.1.2d.tar.gz) = 570753
>+MD5 (hoard-36.tar.gz) = fb6b59a173825601c0f443610ba21740
>+SHA256 (hoard-36.tar.gz) = c125a7e9ac5c6c01548dbbf6d4e63f05905c4594af2ca304b67ce9cf3254e5c9
>+SIZE (hoard-36.tar.gz) = 410960
>diff -ruN --exclude=CVS /usr/ports/devel/libhoard/files/patch-Makefile /home/trasz/libhoard/files/patch-Makefile
>--- /usr/ports/devel/libhoard/files/patch-Makefile	Wed Jun 25 16:37:49 2003
>+++ /home/trasz/libhoard/files/patch-Makefile	Sun Mar 11 11:40:27 2007
>@@ -1,11 +1,29 @@
>---- Makefile.orig	Wed Jun 25 17:44:34 2003
>-+++ Makefile	Wed Jun 25 17:45:03 2003
>-@@ -37,7 +37,7 @@
>- 	$(LIBSO) libhoard.o $(OBJS) -o $@ $(LIBS)
>+--- Makefile.orig	Sun Mar 11 10:57:07 2007
>++++ Makefile	Sun Mar 11 11:00:07 2007
>+@@ -1,6 +1,8 @@
>+ # Commands to compile Hoard for various targets.
>+ # Run make (with no arguments) to see the complete target list.
>  
>- libhoard.o: libhoard.cpp $(SRCS)
>--	$(CXX) $(CXXFLAGS) -c $< -o $@
>-+	$(CXX) $(CXXFLAGS) $(FEATURESXX) -c $< -o $@
>- endif
>++FREEBSD_COMPILE := $(CXX) $(CFLAGS) -static -DNDEBUG  -I. -Iheaplayers -Iheaplayers/util -D_REENTRANT=1 -shared libhoard.cpp -Bsymbolic -o libhoard.so -pthread
>++
>+ DARWIN8_COMPILE := g++ -pipe -O2 -DNDEBUG  -I. -Iheaplayers -Iheaplayers/util -D_REENTRANT=1 -compatibility_version 1 -current_version 1 -dynamiclib libhoard.cpp -o libhoard.dylib -ldl -lpthread
>  
>- ifeq ($(WINDOWS),1)
>+ DARWIN8_COMPILE_DEBUG := g++ -pipe -g -I. -Iheaplayers -Iheaplayers/util -D_REENTRANT=1 -compatibility_version 1 -current_version 1 -dynamiclib libhoard.cpp -o libhoard.dylib -ldl -lpthread
>+@@ -32,6 +34,7 @@
>+ all:
>+ 	@echo "To build Hoard, specify the desired build target:"
>+ 
>++	@echo " freebsd"
>+ 	@echo " darwin"
>+ 	@echo " linux-gcc-x86"
>+ 	@echo " solaris-sunw-sparc"
>+@@ -42,6 +45,9 @@
>+ 	@echo "  (for build instructions on Windows, see NOTES.Windows)"
>+ 
>+ .PHONY: darwin linux-gcc-x86 linux-gcc-x86-debug solaris-sunw-sparc solaris-sunw-x86 solaris-gcc-sparc generic-gcc clean
>++
>++freebsd:
>++	$(FREEBSD_COMPILE)
>+ 
>+ darwin:
>+ 	$(DARWIN8_COMPILE)
>diff -ruN --exclude=CVS /usr/ports/devel/libhoard/files/patch-Makefile.common /home/trasz/libhoard/files/patch-Makefile.common
>--- /usr/ports/devel/libhoard/files/patch-Makefile.common	Wed Aug 31 11:26:37 2005
>+++ /home/trasz/libhoard/files/patch-Makefile.common	Thu Jan  1 01:00:00 1970
>@@ -1,133 +0,0 @@
>---- Makefile.common.orig	Mon Apr  7 19:57:11 2003
>-+++ Makefile.common	Wed Jun 25 17:41:29 2003
>-@@ -21,8 +21,17 @@
>- # or supply new values as parameters to make, e.g.:
>- #   make USE_WINDOWS=1 DEBUG=1
>- 
>-+ifeq ($(OSTYPE),freebsd)
>-+USE_FREEBSD = 1
>-+USE_LINUX = 0
>-+USE_HPUX = 0
>-+USE_WINDOWS = 0
>-+USE_SOLARIS = 0
>-+UNIX = 1
>-+endif
>- 
>- ifeq ($(OSTYPE),hpux)
>-+USE_FREEBSD = 0
>- USE_LINUX = 0
>- USE_HPUX = 1
>- USE_WINDOWS = 0
>-@@ -31,6 +40,7 @@
>- endif
>- 
>- ifeq ($(OSTYPE),linux)
>-+USE_FREEBSD = 0
>- USE_HPUX = 0
>- USE_LINUX = 1		# Linux
>- USE_WINDOWS = 0
>-@@ -39,6 +49,7 @@
>- endif
>- 
>- ifeq ($(OSTYPE),linux-gnu)
>-+USE_FREEBSD = 0
>- USE_HPUX = 0
>- USE_LINUX = 1		# Linux
>- USE_WINDOWS = 0
>-@@ -47,6 +58,7 @@
>- endif
>- 
>- ifeq ($(OSTYPE),solaris)
>-+USE_FREEBSD = 0
>- USE_HPUX = 0
>- USE_LINUX = 0
>- USE_WINDOWS = 0
>-@@ -55,6 +67,7 @@
>- endif
>- 
>- ifeq ($(OS),Windows_NT)
>-+USE_FREEBSD = 0
>- USE_HPUX = 0
>- USE_LINUX = 0
>- USE_WINDOWS = 1
>-@@ -109,6 +122,15 @@
>- #  LIBSO = $(CC) -shared
>- endif
>- 
>-+ifeq ($(USE_FREEBSD),1)
>-+  GNUC = 1
>-+  VPATH = ../run-freebsd
>-+  FEATURES = ${PTHREAD_CFLAGS}
>-+  LIBS = ${PTHREAD_LIBS}
>-+  UNIX = 1
>-+endif
>-+
>-+
>- ifdef BROKEN
>-   CPATH = /usr/bin/
>- endif
>-@@ -125,10 +147,8 @@
>- endif
>- 
>- ifdef GNUC
>--  CC = $(CPATH)gcc
>--  CXX = $(CPATH)g++
>--  FEATURES = -fPIC -D__STRICT_ANSI__ -D_GNU_SOURCE -D_REENTRANT -Wall -fno-exceptions #-fPIC
>--  OPTIMIZE = -O6 -fexpensive-optimizations -finline-functions -fomit-frame-pointer -ffast-math
>-+  FEATURES = -fPIC -D__STRICT_ANSI__ -D_GNU_SOURCE -D_REENTRANT -Wall -fno-exceptions -Wno-deprecated
>-+  OPTIMIZE =
>-   FEATURESXX = $(FEATURES)
>-   OPTIMIZEXX = $(OPTIMIZE)
>-   LIBSO = $(CC) -shared #-nostartfiles
>-@@ -144,40 +164,40 @@
>-   endif
>- 
>- else
>--  CFLAGS = $(FEATURES) -DNDEBUG $(OPTIMIZE)
>--  CXXFLAGS = $(FEATURESXX) -DNDEBUG $(OPTIMIZEXX)
>-+#  CFLAGS = $(FEATURES) -DNDEBUG $(OPTIMIZE)
>-+#  CXXFLAGS = $(FEATURESXX) -DNDEBUG $(OPTIMIZEXX)
>- #  CFLAGS = $(FEATURES) /Zi /DEBUG $(OPTIMIZE)
>- #  CXXFLAGS = $(FEATURESXX) /Zi /DEBUG $(OPTIMIZEXX)
>- endif
>- 
>--LIBS = $(LIBTHREAD)
>-+LIBS = ${PTHREAD_LIBS}
>- 
>- 
>- .SUFFIXES: .c .cpp .o .a .so .tex .dvi .ps .png .bmp .ppm .eps .s .obj
>- 
>- .s.o:
>--	$(CC) $(CFLAGS) -c -o $@ $<
>-+	$(CC) $(CFLAGS) $(FEATURES) -c -o $@ $<
>- 
>- .c.o:
>--	$(CC) $(CFLAGS) -c -o $@ $<
>-+	$(CC) $(CFLAGS) $(FEATURES) -c -o $@ $<
>- 
>- .cpp.o:
>--	$(CXX) $(CXXFLAGS) -c -o $@ $<
>-+	$(CXX) $(CXXFLAGS) $(FEATURESXX) -c -o $@ $<
>- 
>- .c.obj:
>--	$(CC) $(CFLAGS) -c -o $@ $<
>-+	$(CC) $(CFLAGS) $(FEATURES) -c -o $@ $<
>- 
>- .cpp.obj:
>--	$(CXX) $(CXXFLAGS) -c -o $@ $<
>-+	$(CXX) $(CXXFLAGS) $(FEATURESXX) -c -o $@ $<
>- 
>- .o:
>--	$(CC) $(CFLAGS) $< -o $@ $(LIBS)
>-+	$(CC) $(CFLAGS) $(FEATURES) $< -o $@ $(LIBS)
>- 
>- .c:
>--	$(CC) $(CFLAGS) $< -o $@ $(LIBS)
>-+	$(CC) $(CFLAGS) $(FEATURES) $< -o $@ $(LIBS)
>- 
>- .cpp:
>--	$(CXX) $(CXXFLAGS) $< -o $@ $(LIBS)
>-+	$(CXX) $(CXXFLAGS) $(FEATURESXX) $< -o $@ $(LIBS)
>- 
>- .o.a:
>- 	-rm -f $@
>diff -ruN --exclude=CVS /usr/ports/devel/libhoard/pkg-plist /home/trasz/libhoard/pkg-plist
>--- /usr/ports/devel/libhoard/pkg-plist	Sat Jun 21 22:32:54 2003
>+++ /home/trasz/libhoard/pkg-plist	Thu Jan  1 01:00:00 1970
>@@ -1,5 +0,0 @@
>-lib/libhoard.so
>-lib/libhoard.so.1
>-%%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%DOCSDIR%%/asplos2000.pdf
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%

Actions: View | Diff

Attachments on bug 110185: 76435