diff options
| author | mbr <mbr@FreeBSD.org> | 2002-03-08 00:49:17 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-03-08 00:49:17 +0800 |
| commit | 3f96f254f30fdc25478e817c589f73b214372136 (patch) | |
| tree | f3c5a60b243e6eec19b28a94efa15714a19c5a67 /editors/openoffice.org-1.0 | |
| parent | 16407c809a091aa023670d52d93d934562343202 (diff) | |
| download | freebsd-ports-graphics-3f96f254f30fdc25478e817c589f73b214372136.tar.gz freebsd-ports-graphics-3f96f254f30fdc25478e817c589f73b214372136.tar.zst freebsd-ports-graphics-3f96f254f30fdc25478e817c589f73b214372136.zip | |
Avoid double symbols for set_new_handler__FPFv_v. Patch from NetBSD
Diffstat (limited to 'editors/openoffice.org-1.0')
| -rw-r--r-- | editors/openoffice.org-1.0/files/patch-tools+bootstrp+makefile.mk | 23 | ||||
| -rw-r--r-- | editors/openoffice.org-1.0/files/patch-tools::bootstrp::makefile.mk | 23 |
2 files changed, 46 insertions, 0 deletions
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 00000000000..b188641846f --- /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_pic.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 00000000000..b188641846f --- /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_pic.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 ++ |