summaryrefslogtreecommitdiff
path: root/java/jdk16/files/patch-j2se::instrument::Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'java/jdk16/files/patch-j2se::instrument::Makefile')
-rw-r--r--java/jdk16/files/patch-j2se::instrument::Makefile48
1 files changed, 0 insertions, 48 deletions
diff --git a/java/jdk16/files/patch-j2se::instrument::Makefile b/java/jdk16/files/patch-j2se::instrument::Makefile
deleted file mode 100644
index 2ce0f43ea3e3..000000000000
--- a/java/jdk16/files/patch-j2se::instrument::Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-$FreeBSD$
-
---- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005
-+++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005
-@@ -39,5 +39,4 @@
- # into the instrument library.
- #
--ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
- IO_PLATFORM_SRC = $(PLATFORM_SRC)/native/java/io
- LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
-@@ -45,12 +44,4 @@
-
- FILES_c += \
-- inflate.c \
-- infblock.c \
-- infcodes.c \
-- inffast.c \
-- inftrees.c \
-- zadler32.c \
-- infutil.c \
-- zutil.c \
- canonicalize_md.c \
- parse_manifest.c
-@@ -61,5 +60,4 @@
- OTHER_INCLUDES = -I$(SHARE_SRC)/instrument
- OTHER_INCLUDES += -I$(PLATFORM_SRC)/instrument
--OTHER_INCLUDES += -I$(ZIP_SRC)
- OTHER_INCLUDES += -I$(IO_PLATFORM_SRC)
- OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) -I$(LAUNCHER_PLATFORM_SRC)
-@@ -71,9 +61,10 @@
- COMPILER_WARNING_LEVEL=0
- else
-+OTHER_LDLIBS += -lz
- ifeq ($(PLATFORM), bsd)
- ifneq ($(TRUE_PLATFORM), NetBSD)
-- OTHER_INCLUDES += -I/usr/local/include
-- OTHER_LDLIBS += -L/usr/local/lib -liconv
-+ OTHER_INCLUDES += -I${LOCALBASE}/include
-+ OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv
- endif
- else
- OTHER_LDLIBS = -lnsl -ldl
-@@ -123,5 +121,4 @@
- #
- vpath %.c $(SHARE_SRC)/instrument $(PLATFORM_SRC)/instrument
--vpath %.c $(ZIP_SRC)
- vpath %.c $(IO_PLATFORM_SRC)
- vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)