sync with archivers/star

This commit is contained in:
naddy 2002-07-21 01:00:18 +00:00
parent d7829e8b47
commit 105815cc3e
2 changed files with 12 additions and 22 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2002/03/21 21:25:52 espie Exp $
# $OpenBSD: Makefile,v 1.13 2002/07/21 01:00:18 naddy Exp $
COMMENT= "faster and improved version of dd"
DISTNAME= sdd-1.31
CATEGORIES= sysutils
NEED_VERSION= 1.515
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -17,7 +16,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/sdd/
USE_GMAKE= Yes
MAKE_ENV= MAKEPROG="${MAKE_PROGRAM}" CCOM="${CC}"
MAKE_ENV= MAKEPROG="${MAKE_PROGRAM}" CCOM="${CC}" COPTX="${CFLAGS}"
.if ${MACHINE} != "i386" || ${CC} != "cc"
do-configure:

View File

@ -1,24 +1,15 @@
$OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.1 2001/07/19 22:12:07 naddy Exp $
$OpenBSD: patch-RULES_i386-openbsd-cc_rul,v 1.2 2002/07/21 01:00:19 naddy Exp $
--- RULES/i386-openbsd-cc.rul.orig Sun Aug 29 16:09:56 1999
+++ RULES/i386-openbsd-cc.rul Thu Jul 19 23:37:54 2001
@@ -24,7 +24,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
###########################################################################
CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTX)
CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
+++ RULES/i386-openbsd-cc.rul Sun Jul 21 02:55:50 2002
@@ -30,7 +30,7 @@ CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR)
COPTS=
@@ -47,7 +47,7 @@ LIB_KVM=
LIBS_PATH= -L$(OLIBSDIR)
-LDFLAGS= $(LDOPTS) $(LDOPTX)
+LDFLAGS+= $(LDOPTS) $(LDOPTX)
LDLIBS= $(LIBS) $(LIBX)
#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
CWOPTS= -Wall -Wtraditional \
-Wshadow -Wmissing-prototypes -Wstrict-prototypes
-COPTOPT= -O
+COPTOPT=
KDEFINES= -DKERNEL -D_KERNEL
COPTDYN= -fpic
COPTGPROF= -pg
@@ -57,14 +57,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGE
FLOAT_OPTIONS=