require GCC3 on sparc64, don't depend on gmake; ok wcobb@

This commit is contained in:
naddy 2003-08-24 00:34:16 +00:00
parent 766390c28d
commit cd84d13881
2 changed files with 30 additions and 11 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2003/05/12 07:38:08 wcobb Exp $
# $OpenBSD: Makefile,v 1.2 2003/08/24 00:34:16 naddy Exp $
COMMENT= "Convert PNG images to Windows .ico files"
@ -17,17 +17,15 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS= png.3::graphics/png
USE_GMAKE= Yes
NO_REGRESS= Yes
WRKSRC= ${WRKDIR}/png2ico
MODULES= gcc3
MODGCC3_ARCHES= sparc64
MODGCC3_LANGS= C++
post-patch:
cd ${WRKSRC} && \
perl -pi -e \
's|-W -Wall -O2|${CXXFLAGS} -I${LOCALBASE}/include/libpng|' \
${WRKSRC}/Makefile && \
perl -pi -e 's|-lpng|-L${LOCALBASE}/lib -lpng|' ${WRKSRC}/Makefile
LIB_DEPENDS= png.3::graphics/png
MAKE_ENV= CXX="${CXX}"
NO_REGRESS= Yes
WRKDIST= ${WRKDIR}/png2ico
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/png2ico ${PREFIX}/bin

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-Makefile,v 1.1 2003/08/24 00:34:16 naddy Exp $
--- Makefile.orig 2002-12-07 23:49:52.000000000 +0100
+++ Makefile 2003-08-23 13:26:22.000000000 +0200
@@ -1,14 +1,14 @@
-CPPFLAGS=-W -Wall -O2 -finline-functions
+CPPFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng
#CPPFLAGS=-O0 -W -Wall
DEBUG=-g
all: png2ico
png2ico: png2ico.cpp
- g++ $(CPPFLAGS) $(DEBUG) -o $@ $< -lpng -lz -lm
+ $(CXX) $(CPPFLAGS) $(DEBUG) -o $@ $? -L${LOCALBASE}/lib -lpng -lz -lm
doc/png2ico.txt: doc/png2ico.1
- man $< |sed -e $$'s/.\b\\(.\\)/\\1/g' -e 's/\(.*\)/\1'$$'\r/' >$@
+ man $? |sed -e $$'s/.\b\\(.\\)/\\1/g' -e 's/\(.*\)/\1'$$'\r/' >$@
release: clean png2ico doc/png2ico.txt
echo $$'\nHAVE YOU UPDATED VERSION IN BOTH THE UNIX AND THE WINDOWS BUILD?\n'