aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2006-06-22 07:39:12 +0800
committermaho <maho@FreeBSD.org>2006-06-22 07:39:12 +0800
commit3748da53af9bdf0beb10e4c21e0cf1db47a48510 (patch)
tree40618625f8b4b3d94c814d3653cdb7e18faed3e0
parent93ce921c8c33d7dc3a04c534aa4cdb712ae15a11 (diff)
downloadfreebsd-ports-gnome-3748da53af9bdf0beb10e4c21e0cf1db47a48510.tar.gz
freebsd-ports-gnome-3748da53af9bdf0beb10e4c21e0cf1db47a48510.tar.zst
freebsd-ports-gnome-3748da53af9bdf0beb10e4c21e0cf1db47a48510.zip
Unbreak for >=6.1
Submitted by: kris
Diffstat
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile4
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch58
-rw-r--r--editors/openoffice.org-1.1/Makefile4
-rw-r--r--editors/openoffice.org-1.1/files/patch-icu+icu-2.2.patch58
4 files changed, 110 insertions, 14 deletions
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index e94c263d0bd3..84fcfa25222c 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -63,10 +63,6 @@ JAVA_VENDOR= bsdjava
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>
-.if ${OSVERSION} >= 600105
-BROKEN= Does not compile on FreeBSD >= 6.1
-.endif
-
LANG_EXT?= 01
LANG_CONFIGURE_ARG?= ENUS
L10NHELP?= helpcontent_01_unix.tgz
diff --git a/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch b/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch
index c0cda356c8f2..443730140dd5 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch
+++ b/editors/openoffice.org-1.1-devel/files/patch-icu+icu-2.2.patch
@@ -3,10 +3,24 @@ CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at icu project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
+and unbreak the build with
+ccache gcc33 -O -Wl,-rpath,'$ORIGIN' -o genrb errmsg.o genrb.o parse.o read.o reslist.o ustr.o util.o wrtjava.o rle.o -L../../i18n -licui18n -L../../tools/toolutil -licutoolutil -L../../common -licuuc -L../../data/out -L../../stubdata -licudata -lpthread -lm
+../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__class_type_info@GLIBCPP_3.2'
+../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__vmi_class_type_info@GLIBCPP_3.2'
+../../i18n/libicui18n.so: undefined reference to `__gxx_personality_v0@CXXABI_1.2'
+../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__si_class_type_info@GLIBCPP_3.2'
+../../i18n/libicui18n.so: undefined reference to `__cxa_pure_virtual@CXXABI_1.2'
+collect2: ld returned 1 exit status
+gmake[2]: *** [genrb] Error 1
---- icu/icu-2.2.patch Tue Jul 6 19:40:19 2004
-+++ icu/icu-2.2.patch Mon Oct 24 18:36:11 2005
-@@ -1127,3 +1127,33 @@
+Index: icu/icu-2.2.patch
+===================================================================
+RCS file: /cvs/external/icu/Attic/icu-2.2.patch,v
+retrieving revision 1.17.6.2
+diff -u -r1.17.6.2 icu-2.2.patch
+--- icu/icu-2.2.patch 6 Jul 2004 10:40:19 -0000 1.17.6.2
++++ icu/icu-2.2.patch 21 Jun 2006 13:15:33 -0000
+@@ -1127,3 +1127,71 @@
return tempGlyphCount;
};
@@ -40,3 +54,41 @@ We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case
+
+ ## Compiler switch to embed a library name
+ LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET)
++*** misc/icu/source/common/Makefile.in Tue Aug 13 05:30:14 2002
++--- misc/build/icu/source/common/Makefile.in Wed Jun 21 21:58:59 2006
++***************
++*** 142,148 ****
++
++ ifneq ($(ENABLE_SHARED),)
++ $(FINAL_SO_TARGET): $(OBJECTS)
++! $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS)
++
++ ifeq ($(OS390BATCH),1)
++ $(BATCH_TARGET): $(OBJECTS)
++--- 142,148 ----
++
++ ifneq ($(ENABLE_SHARED),)
++ $(FINAL_SO_TARGET): $(OBJECTS)
++! $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS)
++
++ ifeq ($(OS390BATCH),1)
++ $(BATCH_TARGET): $(OBJECTS)
++*** misc/icu/source/i18n/Makefile.in Wed Aug 14 09:38:40 2002
++--- misc/build/icu/source/i18n/Makefile.in Wed Jun 21 22:07:23 2006
++***************
++*** 134,140 ****
++
++ ifneq ($(ENABLE_SHARED),)
++ $(FINAL_SO_TARGET): $(OBJECTS)
++! $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS)
++
++ ifeq ($(OS390BATCH),1)
++ $(BATCH_TARGET):$(OBJECTS)
++--- 134,140 ----
++
++ ifneq ($(ENABLE_SHARED),)
++ $(FINAL_SO_TARGET): $(OBJECTS)
++! $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS)
++
++ ifeq ($(OS390BATCH),1)
++ $(BATCH_TARGET):$(OBJECTS)
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 516a9a7c0732..38e4dcfd40a3 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -65,10 +65,6 @@ JAVA_VENDOR= bsdjava
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>
-.if ${OSVERSION} >= 600105
-BROKEN= Does not compile on FreeBSD >= 6.1
-.endif
-
LANG_EXT?= 01
LANG_CONFIGURE_ARG?= ENUS
L10NHELP?= helpcontent_01_unix.tgz
diff --git a/editors/openoffice.org-1.1/files/patch-icu+icu-2.2.patch b/editors/openoffice.org-1.1/files/patch-icu+icu-2.2.patch
index c0cda356c8f2..443730140dd5 100644
--- a/editors/openoffice.org-1.1/files/patch-icu+icu-2.2.patch
+++ b/editors/openoffice.org-1.1/files/patch-icu+icu-2.2.patch
@@ -3,10 +3,24 @@ CWS : N/A
Author : <maho@openoffice.org> (JCA)
Description : FreeBSD porting : Passing $ORIGIN to linker at icu project
We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case.
+and unbreak the build with
+ccache gcc33 -O -Wl,-rpath,'$ORIGIN' -o genrb errmsg.o genrb.o parse.o read.o reslist.o ustr.o util.o wrtjava.o rle.o -L../../i18n -licui18n -L../../tools/toolutil -licutoolutil -L../../common -licuuc -L../../data/out -L../../stubdata -licudata -lpthread -lm
+../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__class_type_info@GLIBCPP_3.2'
+../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__vmi_class_type_info@GLIBCPP_3.2'
+../../i18n/libicui18n.so: undefined reference to `__gxx_personality_v0@CXXABI_1.2'
+../../i18n/libicui18n.so: undefined reference to `vtable for __cxxabiv1::__si_class_type_info@GLIBCPP_3.2'
+../../i18n/libicui18n.so: undefined reference to `__cxa_pure_virtual@CXXABI_1.2'
+collect2: ld returned 1 exit status
+gmake[2]: *** [genrb] Error 1
---- icu/icu-2.2.patch Tue Jul 6 19:40:19 2004
-+++ icu/icu-2.2.patch Mon Oct 24 18:36:11 2005
-@@ -1127,3 +1127,33 @@
+Index: icu/icu-2.2.patch
+===================================================================
+RCS file: /cvs/external/icu/Attic/icu-2.2.patch,v
+retrieving revision 1.17.6.2
+diff -u -r1.17.6.2 icu-2.2.patch
+--- icu/icu-2.2.patch 6 Jul 2004 10:40:19 -0000 1.17.6.2
++++ icu/icu-2.2.patch 21 Jun 2006 13:15:33 -0000
+@@ -1127,3 +1127,71 @@
return tempGlyphCount;
};
@@ -40,3 +54,41 @@ We also want to pass -rpath $ORIGIN to linker as GNU/Linux and/or Solaris's case
+
+ ## Compiler switch to embed a library name
+ LD_SONAME = -Wl,-soname -Wl,$(MIDDLE_SO_TARGET)
++*** misc/icu/source/common/Makefile.in Tue Aug 13 05:30:14 2002
++--- misc/build/icu/source/common/Makefile.in Wed Jun 21 21:58:59 2006
++***************
++*** 142,148 ****
++
++ ifneq ($(ENABLE_SHARED),)
++ $(FINAL_SO_TARGET): $(OBJECTS)
++! $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS)
++
++ ifeq ($(OS390BATCH),1)
++ $(BATCH_TARGET): $(OBJECTS)
++--- 142,148 ----
++
++ ifneq ($(ENABLE_SHARED),)
++ $(FINAL_SO_TARGET): $(OBJECTS)
++! $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS)
++
++ ifeq ($(OS390BATCH),1)
++ $(BATCH_TARGET): $(OBJECTS)
++*** misc/icu/source/i18n/Makefile.in Wed Aug 14 09:38:40 2002
++--- misc/build/icu/source/i18n/Makefile.in Wed Jun 21 22:07:23 2006
++***************
++*** 134,140 ****
++
++ ifneq ($(ENABLE_SHARED),)
++ $(FINAL_SO_TARGET): $(OBJECTS)
++! $(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS)
++
++ ifeq ($(OS390BATCH),1)
++ $(BATCH_TARGET):$(OBJECTS)
++--- 134,140 ----
++
++ ifneq ($(ENABLE_SHARED),)
++ $(FINAL_SO_TARGET): $(OBJECTS)
++! $(SHLIB.c) $(LD_SONAME) -o $@ $^ $(LIBS)
++
++ ifeq ($(OS390BATCH),1)
++ $(BATCH_TARGET):$(OBJECTS)
generated by cgit (git 2.34.1) at 2025-01-08 04:23:38 +0800