From fe99f7ef94cbe223f0be6842544d0cb58dca9c59 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Fri, 8 Mar 2002 14:00:00 +0000 Subject: [PATCH] Avoid twice defined set_new_handler__FPFv_v symbol. Patch from NetBSD --- .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ .../files/patch-tools::bootstrp:makefile.mk | 23 +++++++++++++++++++ 20 files changed, 460 insertions(+) create mode 100644 editors/openoffice-1.0/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice-1.1-devel/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice-1.1/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice-2.0-devel/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice-3-devel/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice-3/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice-devel/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-1.0/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-1.1-devel/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-1.1/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-2-RC/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-2-devel/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-2.0-devel/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-2.0/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-2/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-3-RC/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-3-devel/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-3/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice.org-vcltesttool/files/patch-tools::bootstrp:makefile.mk create mode 100644 editors/openoffice/files/patch-tools::bootstrp:makefile.mk diff --git a/editors/openoffice-1.0/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice-1.0/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice-1.1-devel/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice-1.1-devel/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice-1.1/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice-1.1/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice-2.0-devel/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice-2.0-devel/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice-3-devel/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice-3-devel/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice-3/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice-3/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice-3/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice-devel/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice-devel/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice-devel/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-1.0/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-1.0/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-1.0/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-1.1-devel/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-1.1/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-1.1/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-2-RC/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-2-RC/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-2-devel/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-2-devel/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-2.0-devel/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-2.0/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-2.0/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-2/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-2/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-3-RC/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-3-RC/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-3-devel/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-3-devel/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-3/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-3/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice.org-vcltesttool/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++ diff --git a/editors/openoffice/files/patch-tools::bootstrp:makefile.mk b/editors/openoffice/files/patch-tools::bootstrp:makefile.mk new file mode 100644 index 000000000000..753f23a771e3 --- /dev/null +++ b/editors/openoffice/files/patch-tools::bootstrp:makefile.mk @@ -0,0 +1,23 @@ +--- ../tools/bootstrp/makefile.mk.orig Tue Jan 1 14:12:19 2002 ++++ ../tools/bootstrp/makefile.mk +@@ -83,6 +83,15 @@ + @echo No bootstrp for Mac OS + .ELSE # "$(OS)"=="MACOS" + ++.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" ++ALLTAR2: $(LB)$/libgcc_pic.a $(LB)$/libgcc.a ALLTAR ++ @echo "" ++$(LB)$/libgcc_pic.a: ++ -objcopy -L set_new_handler__FPFv_v /usr/lib/libgcc.a $(LB)$/libgcc_pic.a ++$(LB)$/libgcc.a: ++ objcopy -L set_new_handler__FPFv_v `gcc -print-libgcc-file-name` $(LB)$/libgcc.a ++.ENDIF ++ + OBJFILES= \ + $(OBJ)$/sstring.obj \ + $(OBJ)$/appdef.obj \ +@@ -172,3 +181,4 @@ + # --- Targets ------------------------------------------------------ + + .INCLUDE : target.mk ++