mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-22 08:58:47 +00:00
- Rename variable ARCH in the freetype Makefile to FTARCH to avoid conflict
with ARCH from the ports infrastructure. This fixes build on amd64. - Nuke USE_GMAKE while i am here. the port builds fine with our make.
This commit is contained in:
parent
57a3e704b3
commit
ad1f05ade4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=116907
@ -20,7 +20,6 @@ MASTER_SITE_SUBDIR= freetype1
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= A free and portable TrueType font rendering engine
|
||||
|
||||
USE_GMAKE= yes
|
||||
USE_LIBTOOL_VER=13
|
||||
INSTALLS_SHLIB= yes
|
||||
CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared
|
||||
|
@ -1,8 +1,25 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- lib/arch/unix/Makefile.in 2002/03/14 07:15:48 1.1
|
||||
+++ lib/arch/unix/Makefile.in 2002/03/14 07:16:24
|
||||
--- lib/arch/unix/Makefile.in.orig Sat Jul 31 08:48:17 1999
|
||||
+++ lib/arch/unix/Makefile.in Sat Aug 21 12:55:07 2004
|
||||
@@ -2,8 +2,8 @@
|
||||
#
|
||||
# lib/arch/unix/Makefile.in
|
||||
|
||||
-ARCH = arch/unix
|
||||
-FT_MAKEFILE = $(ARCH)/Makefile
|
||||
+FTARCH = arch/unix
|
||||
+FT_MAKEFILE = $(FTARCH)/Makefile
|
||||
|
||||
RM = @RM@
|
||||
RMF = @RM@ -f
|
||||
@@ -83,7 +83,7 @@
|
||||
$(srcdir)/$(FILESRC) \
|
||||
$(srcdir)/$(MEMSRC) \
|
||||
$(srcdir)/$(MUTEXSRC)
|
||||
-SRC_S = $(srcdir)/$(ARCH)/freetype.c
|
||||
+SRC_S = $(srcdir)/$(FTARCH)/freetype.c
|
||||
|
||||
# all header files
|
||||
HEADERS = $(srcdir)/freetype.h \
|
||||
@@ -200,10 +200,10 @@
|
||||
-version-info $(version_info) $(FT_LIBS)
|
||||
|
||||
@ -16,3 +33,30 @@ $FreeBSD$
|
||||
done
|
||||
|
||||
uninstall:
|
||||
@@ -218,15 +218,15 @@
|
||||
-$(RMF) file.c memory.c mutex.c
|
||||
-$(RMF) libttf.la
|
||||
-$(RMF) *.orig *~ core *.core
|
||||
- -$(RMF) $(ARCH)/Makefile
|
||||
+ -$(RMF) $(FTARCH)/Makefile
|
||||
-$(RMF) .libs/*
|
||||
-$(RMDIR) .libs
|
||||
|
||||
depend: do_link
|
||||
(echo '/^#.* PUT NO STUFF BELOW/,$$d' ; echo w ; echo q) | \
|
||||
- ed - $(ARCH)/Makefile
|
||||
+ ed - $(FTARCH)/Makefile
|
||||
echo '# Dependencies generated by make depend: PUT NO STUFF BELOW' \
|
||||
- >> $(ARCH)/Makefile
|
||||
+ >> $(FTARCH)/Makefile
|
||||
for file in $(SRC_S) $(SRC_M) $(EXTSRC) ; do \
|
||||
$(CPP) $(CPPFLAGS) $(INCLUDES) $$file | \
|
||||
sed -n -e 's|^# [1-9][0-9]* "\([^/].*\.h\)".*|\1|p' \
|
||||
@@ -239,6 +239,6 @@
|
||||
else if ($$1 != last) \
|
||||
{ print line ; line = last = $$1 } \
|
||||
line = line " " $$2 } \
|
||||
- END { print line }' >> $(ARCH)/Makefile
|
||||
+ END { print line }' >> $(FTARCH)/Makefile
|
||||
|
||||
# Dependencies generated by make depend: PUT NO STUFF BELOW
|
||||
|
Loading…
Reference in New Issue
Block a user