cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- build on archs other than i386

Browse Source 
- honor CC, CFLAGS
This commit is contained in:
naddy 2001-10-03 16:08:48 +00:00
parent d79cf45c1b
commit 39571db430
3 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
misc/cdrdao/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2001/09/28 06:02:14 pvalchev Exp $
# $OpenBSD: Makefile,v 1.13 2001/10/03 16:08:48 naddy Exp $
COMMENT= "write audio/data CD-Rs in disk-at-once mode"
@ -24,6 +24,13 @@ USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf dest
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/paranoia ${WRKSRC}/scsilib
CONFIGURE_ARGS+= --with-posix-threads=no
MAKE_ENV= CCOM="${CC}"
.if ${MACHINE} != "i386" || ${CC} != "cc"
pre-configure:
@ln -sf ${WRKSRC}/scsilib/RULES/i386-openbsd-cc.rul \
${WRKSRC}/scsilib/RULES/${MACHINE}-openbsd-${CC}.rul
.endif
post-install:
@strip ${PREFIX}/bin/cdrdao

47
misc/cdrdao/patches/patch-scsilib_RULES_i386-openbsd-cc_rul Normal file
View File

@ -0,0 +1,47 @@
$OpenBSD: patch-scsilib_RULES_i386-openbsd-cc_rul,v 1.1 2001/10/03 16:08:48 naddy Exp $
--- scsilib/RULES/i386-openbsd-cc.rul.orig Sun Apr 29 10:44:45 2001
+++ scsilib/RULES/i386-openbsd-cc.rul Mon Oct 1 20:04:09 2001
@@ -24,13 +24,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.prg
###########################################################################
CPPFLAGS= $(CPPOPTS) $(CPPOPTX)
-CFLAGS= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
+CFLAGS+= $(COPTS) $(CWARNOPTS) $(COPTOPT) $(COPTX)
CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
COPTS=
CWOPTS= -Wall -Wtraditional \
-Wshadow -Wmissing-prototypes -Wstrict-prototypes
-COPTOPT= -O
+COPTOPT=
KDEFINES= -DKERNEL -D_KERNEL
COPTDYN= -fpic
COPTGPROF= -pg
@@ -47,7 +47,7 @@ LIB_KVM=
LIBS_PATH= -L$(OLIBSDIR)
-LDFLAGS= $(LDOPTS) $(LDOPTX)
+LDFLAGS+= $(LDOPTS) $(LDOPTX)
LDLIBS= $(LIBS) $(LIBX)
#LDOPTS= $(LIBS_PATH) $(LDPATH) $(RUNPATH)
@@ -57,14 +57,14 @@ LNDYNLIB= @$(SYMLINK) $(TARGET) $(PTARGE
FLOAT_OPTIONS=
-CC= @echo " ==> COMPILING \"$@\""; gcc
-LDCC= @echo " ==> LINKING \"$@\""; gcc
-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
+CC= @echo " ==> COMPILING \"$@\""; $(CCOM)
+LDCC= @echo " ==> LINKING \"$@\""; $(CCOM)
+DYNLD= @echo " ==> LINKING dynamic library \"$@\""; $(CCOM)
RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
ARFLAGS= cr
LORDER= lorder
TSORT= tsort
RMDEP= :
-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
+MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); $(CCOM) -M
MKDEP_OUT=

12
misc/cdrdao/patches/patch-scsilib_RULES_rules1_top Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-scsilib_RULES_rules1_top,v 1.1 2001/10/03 16:08:48 naddy Exp $
--- scsilib/RULES/rules1.top.orig Sun Apr 29 10:44:46 2001
+++ scsilib/RULES/rules1.top Mon Oct 1 20:04:22 2001
@@ -186,7 +186,7 @@ __PARCH= $(_PARCH:$(_UNIQ)=$(PARCH_DEF))
PARCH= $(__PARCH:$(_UNIQ)%=%)
#OARCH= $(MARCH)$(-O_ARCH)-$(C_ARCH)
-OARCH= $(PARCH)$(-O_ARCH)-$(C_ARCH)
+OARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
XARCH= $(K_ARCH)$(-O_ARCH)-$(C_ARCH)
.print:
echo $(XP_ARCH) $(P_ARCH)