Attachment #39595 for bug #62395

View | Details | Raw Unified | Return to bug 62395
Collapse All | Expand All




COMMENT=	C++ Portable Types Library

SHLIB_VER=	19

INSTALLS_SHLIB=	yes
MAKE_ARGS+=	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
PTYPES_CFLAGS=	${CFLAGS}

OPTIONS=	DEBUG "Build debug version" off \
		OPTIMIZED "Enable -O2 optimization" on

.include <bsd.port.pre.mk>

.if defined(WITH_DEBUG)
DEBUG_FLAGS=	-DDEBUG
.endif
.if defined(WITH_OPTIMIZED)
PTYPES_CFLAGS+=	-O2
.endif

MAKE_ARGS+=	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
		DEBUG_FLAGS=${DEBUG_FLAGS} PTYPES_CFLAGS="${PTYPES_CFLAGS}"

do-install:
	${MKDIR} ${PREFIX}/include/ptypes

	cd ${WRKSRC}/doc; ${TAR} cf - *| ${TAR} xf - -C ${DOCSDIR}/doc
.endif

.include <bsd.port.post.mk>




 RANLIB          = ranlib
 
-DDEBUG          = -DDEBUG
+DDEBUG          = $(DEBUG_FLAGS)
 INCDIR          = ../include
-CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall -O2
+CXXOPTS         = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall $(PTYPES_CFLAGS)
 LDLIBS          = $(OS_LDLIBS)
 
-CXXOPTS_ST      = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -Wall -O2
+CXXOPTS_ST      = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -Wall $(PTYPES_CFLAGS)
 LDLIBS_ST       = $(OS_LDLIBS_ST)
 
 LIBNAME         = libptypes.a

Lines 5-14 Link Here

(-)/usr/ports/devel/ptypes/files/patch-wshare-Makefile.common (-2 / +2 lines)
5	.SUFFIXES: .cxx .o	5	.SUFFIXES: .cxx .o
6		6
7	-DDEBUG = -DDEBUG	7	-DDEBUG = -DDEBUG
8	+DDEBUG =	8	+DDEBUG = $(DEBUG_FLAGS)
9	INCDIR = ../include	9	INCDIR = ../include
10	-CXXOPTS = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall -O2	10	-CXXOPTS = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall -O2
11	+CXXOPTS = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall $(CFLAGS)	11	+CXXOPTS = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -Wall $(PTYPES_CFLAGS)
12	LDLIBS = $(OS_LDLIBS)	12	LDLIBS = $(OS_LDLIBS)
13		13
14	BINDEST = ../bin	14	BINDEST = ../bin

Return to bug 62395

Lines 16-24 Link Here

(-)/usr/ports/devel/ptypes/Makefile (-2 / +18 lines)
16	COMMENT= C++ Portable Types Library	16	COMMENT= C++ Portable Types Library
17		17
18	SHLIB_VER= 19	18	SHLIB_VER= 19
		19
19	INSTALLS_SHLIB= yes	20	INSTALLS_SHLIB= yes
20	MAKE_ARGS+= PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
21	PLIST_SUB+= SHLIB_VER=${SHLIB_VER}	21	PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
		22	PTYPES_CFLAGS= ${CFLAGS}
		23
		24	OPTIONS= DEBUG "Build debug version" off \
		25	OPTIMIZED "Enable -O2 optimization" on
		26
		27	.include <bsd.port.pre.mk>
		28
		29	.if defined(WITH_DEBUG)
		30	DEBUG_FLAGS= -DDEBUG
		31	.endif
		32	.if defined(WITH_OPTIMIZED)
		33	PTYPES_CFLAGS+= -O2
		34	.endif
		35
		36	MAKE_ARGS+= PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
		37	DEBUG_FLAGS=${DEBUG_FLAGS} PTYPES_CFLAGS="${PTYPES_CFLAGS}"
22		38
23	do-install:	39	do-install:
24	${MKDIR} ${PREFIX}/include/ptypes	40	${MKDIR} ${PREFIX}/include/ptypes
Lines 38-41 Link Here
38	cd ${WRKSRC}/doc; ${TAR} cf - *\| ${TAR} xf - -C ${DOCSDIR}/doc	54	cd ${WRKSRC}/doc; ${TAR} cf - *\| ${TAR} xf - -C ${DOCSDIR}/doc
39	.endif	55	.endif
40		56
41	.include <bsd.port.mk>	57	.include <bsd.port.post.mk>

Lines 5-18 Link Here

(-)/usr/ports/devel/ptypes/files/patch-src-Makefile.common (-3 / +3 lines)
5	RANLIB = ranlib	5	RANLIB = ranlib
6		6
7	-DDEBUG = -DDEBUG	7	-DDEBUG = -DDEBUG
8	+DDEBUG =	8	+DDEBUG = $(DEBUG_FLAGS)
9	INCDIR = ../include	9	INCDIR = ../include
10	-CXXOPTS = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall -O2	10	-CXXOPTS = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall -O2
11	+CXXOPTS = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall $(CFLAGS)	11	+CXXOPTS = $(OS_CXXOPTS) $(DDEBUG) -I$(INCDIR) -fPIC -Wall $(PTYPES_CFLAGS)
12	LDLIBS = $(OS_LDLIBS)	12	LDLIBS = $(OS_LDLIBS)
13		13
14	-CXXOPTS_ST = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -Wall -O2	14	-CXXOPTS_ST = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -Wall -O2
15	+CXXOPTS_ST = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -Wall $(CFLAGS)	15	+CXXOPTS_ST = -DPTYPES_ST $(OS_CXXOPTS_ST) $(DDEBUG) -I$(INCDIR) -Wall $(PTYPES_CFLAGS)
16	LDLIBS_ST = $(OS_LDLIBS_ST)	16	LDLIBS_ST = $(OS_LDLIBS_ST)
17		17
18	LIBNAME = libptypes.a	18	LIBNAME = libptypes.a