mirror of
https://git.freebsd.org/ports.git
synced 2025-06-23 05:30:31 -04:00
8c0ebdb48c
Changes: * Fixed bug with handling of priorities and associativity (thanx Sjoerd Cranen) * Fixed a bug in error recovery. * Fixed a slash escapes in string literals (thanx Sjoerd Cranen) * Fixed bug with actions containing commments containing ' * Python 2.6+ support (thanx to jonas@lophus.org) - Trim Makefile header - Convert to OptionsNG
53 lines
1.7 KiB
Text
53 lines
1.7 KiB
Text
--- Makefile.orig 2013-01-23 03:56:43.000000000 +0100
|
|
+++ Makefile 2013-01-23 17:40:57.000000000 +0100
|
|
@@ -11,7 +11,7 @@
|
|
MINOR=29
|
|
RELEASE=$(MAJOR).$(MINOR)
|
|
|
|
-CC = gcc
|
|
+CC ?= gcc
|
|
|
|
ifndef PREFIX
|
|
PREFIX=/usr/local
|
|
@@ -38,7 +38,7 @@
|
|
ARCH = x86
|
|
endif
|
|
|
|
-ifeq ($(ARCH),x86_64)
|
|
+ifeq ($(ARCH),amd64)
|
|
CFLAGS += -fPIC
|
|
endif
|
|
|
|
@@ -64,10 +64,10 @@
|
|
CFLAGS += -DUSE_FREELISTS
|
|
endif
|
|
|
|
-D_BUILD_VERSION = $(shell git show-ref 2> /dev/null | head -1 | cut -d ' ' -f 1)
|
|
-ifeq ($(D_BUILD_VERSION),)
|
|
- D_BUILD_VERSION = $(shell cat D_BUILD_VERSION)
|
|
-endif
|
|
+#D_BUILD_VERSION = $(shell git show-ref 2> /dev/null | head -1 | cut -d ' ' -f 1)
|
|
+#ifeq ($(D_BUILD_VERSION),)
|
|
+ D_BUILD_VERSION = $(shell cat BUILD_VERSION)
|
|
+#endif
|
|
CFLAGS += -DD_MAJOR_VERSION=$(MAJOR) -DD_MINOR_VERSION=$(MINOR) -DD_BUILD_VERSION=\"$(D_BUILD_VERSION)\"
|
|
|
|
CFLAGS += -Wall
|
|
@@ -96,7 +96,7 @@
|
|
PYTHON_FILES = d/python/Makefile d/python/*.py d/python/*.c d/python/*.h d/python/*.i d/python/README d/python/*.html d/python/contrib/d* d/python/tests/*.py
|
|
VERILOG_FILES = d/verilog/Makefile d/verilog/verilog.g d/verilog/README d/verilog/ambig.c \
|
|
d/verilog/main.c d/verilog/vparse.c d/verilog/vparse.h d/verilog/verilog_tests
|
|
-TAR_FILES = $(AUX_FILES) $(TEST_FILES) $(PYTHON_FILES) $(VERILOG_FILES) d/BUILD_VERSION \
|
|
+TAR_FILES = $(AUX_FILES) $(TEST_FILES) $(PYTHON_FILES) $(VERILOG_FILES) \
|
|
d/grammar.g d/sample.g d/my.g
|
|
|
|
LIB_SRCS = arg.c parse.c scan.c symtab.c util.c read_binary.c dparse_tree.c
|
|
@@ -143,7 +143,7 @@
|
|
|
|
ALL_SRCS = $(MAKE_PARSER_SRCS) $(BASE_SAMPLE_PARSER_SRCS) $(LIB_SRCS) $(MK_LIB_SRCS)
|
|
|
|
-all: $(EXECS) $(LIBRARIES) BUILD_VERSION make_dparser.cat
|
|
+all: $(EXECS) $(LIBRARIES) make_dparser.cat
|
|
|
|
version:
|
|
echo $(OS_TYPE) $(OS_VERSION)
|