sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Allow this port to be compiled with CC set to something containing a

Browse source 
path component. [1]
- Add the usual MAKE_ENV=LANG=C workaround in order to prevent problems
  from bad interactions of gmake, the Schily makefile system and certain
  locales.

Requested by:	kris [1]
Approved by:	netchild
This commit is contained in:
Marius Strobl 2006-05-07 16:39:29 +00:00
parent f1de23c3fa
commit f5f1ee4bcc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=161618
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sysutils/sformat/Makefile
View file

@ -19,23 +19,23 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= marius@FreeBSD.org MAINTAINER= marius@FreeBSD.org
COMMENT= Allows formatting/partitioning/analysis/repairing of SCSI disks COMMENT= Allows formatting/partitioning/analysis/repairing of SCSI disks
LIBSCHILY= libschily-2.01.01a07.tar.gz
USE_GMAKE= yes USE_GMAKE= yes
MAN1= sformat.1 MAN1= sformat.1
LIBSCHILY= libschily-2.01.01a07.tar.gz
MAKE_ENV= CCOM=${CC}
SFMTTARGET= ${ARCH}-freebsd-${CC}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
CCOM!= ${BASENAME} ${CC}
MAKE_ENV= CCOM=${CCOM} LANG=C
SFMTTARGET= ${ARCH}-freebsd-${CCOM}
post-extract: post-extract:
@cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ @cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
${DISTDIR}/${DIST_SUBDIR}/${LIBSCHILY} ${EXTRACT_AFTER_ARGS} ${DISTDIR}/${DIST_SUBDIR}/${LIBSCHILY} ${EXTRACT_AFTER_ARGS}
.for i in config.guess config.sub .for i in config.guess config.sub
@${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/conf @${CP} ${PORTSDIR}/Templates/${i} ${WRKSRC}/conf
.endfor .endfor
.if ${ARCH} != "i386" || ${CC} != "cc" .if ${SFMTTARGET} != "i386-freebsd-cc"
@${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \ @${LN} -sf ${WRKSRC}/RULES/i386-freebsd-cc.rul \
${WRKSRC}/RULES/${SFMTTARGET}.rul ${WRKSRC}/RULES/${SFMTTARGET}.rul
.endif .endif

9
sysutils/sformat/files/patch-RULES::i386-freebsd-cc.rul
View file

@ -10,7 +10,7 @@
CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS) CPPOPTS= -I. -I$(ARCHDIR) -I$(OINCSDIR) $(INCDIRS:%=-I%) $(OSDEFS)
COPTS= COPTS=
@@ -57,14 +58,13 @@ @@ -57,14 +58,14 @@
FLOAT_OPTIONS= FLOAT_OPTIONS=
@ -18,8 +18,9 @@
-LDCC= @echo " ==> LINKING \"$@\""; gcc -LDCC= @echo " ==> LINKING \"$@\""; gcc
-DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc -DYNLD= @echo " ==> LINKING dynamic library \"$@\""; gcc
-RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib -RANLIB= @echo " ==> RANDOMIZING ARCHIVE \"$@\""; ranlib
+LDCC= $(CCOM) +CCCOM= $(CC)
+DYNLD= $(CCOM) +LDCC= $(CCCOM)
+DYNLD= $(CCCOM)
+RANLIB= ranlib +RANLIB= ranlib
ARFLAGS= cr ARFLAGS= cr
LORDER= lorder LORDER= lorder
@ -27,5 +28,5 @@
RMDEP= : RMDEP= :
-MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M -MKDEP= @echo " ==> MAKING DEPENDENCIES \"$@\""; $(RMDEP); gcc -M
+MKDEP= $(CCOM) -M +MKDEP= $(CCCOM) -M
MKDEP_OUT= MKDEP_OUT=