[evolution-patches] gal and gtkhtml Makefile patches for Darwin

From: Dan Winship <danw ximian com>
To: evolution-patches ximian com
Subject: [evolution-patches] gal and gtkhtml Makefile patches for Darwin
Date: Wed, 03 Sep 2003 12:39:09 -0400

A while back, someone added -no-undefined to a bunch of LDFLAGS "which
is necessary for building shared library on some platforms (e.g. Win32,
BeOS).". But the libtool docs say:

        `-no-undefined'
             Declare that OUTPUT-FILE does not depend on any other libraries.
             Some platforms cannot create shared libraries that depend on other
             libraries (*note Inter-library dependencies::).

and that is not true of any of our libraries. Adding -no-undefined makes
them not build on Darwin/OS X, since it actually checks that there are
no undefined symbols.

The Sun people already removed some of the -no-undefineds because they
were breaking Solaris. These patches remove the rest.

It also does two other things in gtkhtml: removes the "-static" from
testgtkhtml's compile flags (which was removed once before but then got
accidentally readded as part of an unrelated commit) and adds "-module"
to libgnome-gtkhtml-editor's LDFLAGS, which is a no-op on Linux, but
required on Darwin.

Patches for both stable and head attached.

-- Dan

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/ChangeLog,v
retrieving revision 1.800.2.3
diff -u -r1.800.2.3 ChangeLog
--- ChangeLog	20 Aug 2003 17:58:08 -0000	1.800.2.3
+++ ChangeLog	3 Sep 2003 16:18:57 -0000
@@ -1,3 +1,8 @@
+2003-09-03  Dan Winship  <danw ximian com>
+
+	* gal/Makefile.am (libgal_2_0_la_LDFLAGS): Remove -no-undefined
+	here too.
+
 2003-08-20  Suresh Chandrasekharan  <suresh chandrasekharan sun com>
 
 	* gal/util/e-util.c (e_filename_make_safe): Fix for 47474
Index: gal/Makefile.am
===================================================================
RCS file: /cvs/gnome/gal/gal/Makefile.am,v
retrieving revision 1.68
diff -u -r1.68 Makefile.am
--- gal/Makefile.am	31 Jul 2003 04:04:04 -0000	1.68
+++ gal/Makefile.am	3 Sep 2003 16:18:57 -0000
@@ -6,7 +6,6 @@
 lib_LTLIBRARIES = libgal-2.0.la
 
 libgal_2_0_la_LDFLAGS = -version-info $(GAL_CURRENT):$(GAL_REVISION):$(GAL_AGE) \
-		    -no-undefined \
 		    $(ICONV_LIBS)
 libgal_2_0_la_SOURCES = bogus_automake_hack.c

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/ChangeLog,v
retrieving revision 1.803
diff -u -r1.803 ChangeLog
--- ChangeLog	21 Aug 2003 01:27:09 -0000	1.803
+++ ChangeLog	3 Sep 2003 16:29:09 -0000
@@ -1,3 +1,8 @@
+2003-09-03  Dan Winship  <danw ximian com>
+
+	* gal/Makefile.am (libgal_2_2_la_LDFLAGS): Remove -no-undefined
+	here too.
+
 2003-08-20  Suresh Chandrasekharan  <suresh chandrasekharan sun com>
 	
 	* gal/util/e-util.c (e_filename_make_safe): Fix for 47474
Index: gal/Makefile.am
===================================================================
RCS file: /cvs/gnome/gal/gal/Makefile.am,v
retrieving revision 1.69
diff -u -r1.69 Makefile.am
--- gal/Makefile.am	13 Aug 2003 16:40:58 -0000	1.69
+++ gal/Makefile.am	3 Sep 2003 16:29:09 -0000
@@ -6,7 +6,6 @@
 lib_LTLIBRARIES = libgal-2.2.la
 
 libgal_2_2_la_LDFLAGS = -version-info $(GAL_CURRENT):$(GAL_REVISION):$(GAL_AGE) \
-		    -no-undefined \
 		    $(ICONV_LIBS)
 libgal_2_2_la_SOURCES = bogus_automake_hack.c

Index: components/html-editor/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.410.2.4
diff -u -r1.410.2.4 ChangeLog
--- components/html-editor/ChangeLog	8 Aug 2003 04:20:26 -0000	1.410.2.4
+++ components/html-editor/ChangeLog	3 Sep 2003 16:27:49 -0000
@@ -1,8 +1,13 @@
+2003-09-03  Dan Winship  <danw ximian com>
+
+	* Makefile.am (libgnome_gtkhtml_editor_3_0_la_LDFLAGS): Remove
+	-no-undefined (which is wrong), and add -module
+
 2003-08-08  Yuedong Du  <yuedong du sun com>
-                                                                                
+
         * menubar.c: fix a typo cause bullet list not work. See bug
         #47387
-                                                                                
+
 2003-07-28  Alex Jiang <alex jiang sun com>
 
 	* image.c (changed_template): before clear option data, check 
Index: components/html-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/Makefile.am,v
retrieving revision 1.89
diff -u -r1.89 Makefile.am
--- components/html-editor/Makefile.am	26 Jun 2003 14:38:29 -0000	1.89
+++ components/html-editor/Makefile.am	3 Sep 2003 16:27:49 -0000
@@ -130,7 +130,7 @@
 	editor-control-shlib.c
 
 libgnome_gtkhtml_editor_3_0_la_LDFLAGS =	\
-	-avoid-version -no-undefined
+	-avoid-version -module
 
 libgnome_gtkhtml_editor_3_0_la_LIBADD =	\
 	$(LDADD)			\
Index: src/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.1814.2.9
diff -u -r1.1814.2.9 ChangeLog
--- src/ChangeLog	2 Sep 2003 02:03:22 -0000	1.1814.2.9
+++ src/ChangeLog	3 Sep 2003 16:27:54 -0000
@@ -1,3 +1,7 @@
+2003-09-03  Dan Winship  <danw ximian com>
+
+	* Makefile.am (testgtkhtml_LDFLAGS): Remove -static again
+
 2003-09-01  Maxx Cao  <maxx cao sun com>
 
 	* htmltextslave.c (get_offset_for_pointer): add consideration for
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/Makefile.am,v
retrieving revision 1.136
diff -u -r1.136 Makefile.am
--- src/Makefile.am	5 May 2003 20:39:19 -0000	1.136
+++ src/Makefile.am	3 Sep 2003 16:27:54 -0000
@@ -209,7 +209,6 @@
 	testgtkhtml.c		\
 	htmlurl.h		\
 	htmlurl.c
-testgtkhtml_LDFLAGS = -static
 testgtkhtml_LDADD =					\
 	libgtkhtml- GTKHTML_RELEASE@.la			\
 	../a11y/libgtkhtml-a11y- GTKHTML_RELEASE@.la 	\

Index: components/html-editor/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.418
diff -u -r1.418 ChangeLog
--- components/html-editor/ChangeLog	2 Sep 2003 22:10:22 -0000	1.418
+++ components/html-editor/ChangeLog	3 Sep 2003 16:27:08 -0000
@@ -1,3 +1,8 @@
+2003-09-03  Dan Winship  <danw ximian com>
+
+	* Makefile.am (libgnome_gtkhtml_editor_3_1_la_LDFLAGS): Remove
+	-no-undefined (which is wrong), and add -module.
+
 2003-09-02  Larry Ewing  <lewing ximian com>
 
 	* GNOME_GtkHTML_Editor-emacs.xml.in: add file with emacs friendly
Index: components/html-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/Makefile.am,v
retrieving revision 1.91
diff -u -r1.91 Makefile.am
--- components/html-editor/Makefile.am	2 Sep 2003 22:10:22 -0000	1.91
+++ components/html-editor/Makefile.am	3 Sep 2003 16:27:08 -0000
@@ -130,7 +130,7 @@
 	editor-control-shlib.c
 
 libgnome_gtkhtml_editor_3_1_la_LDFLAGS =	\
-	-avoid-version -no-undefined
+	-avoid-version -module
 
 libgnome_gtkhtml_editor_3_1_la_LIBADD =	\
 	$(LDADD)			\
Index: src/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.1863
diff -u -r1.1863 ChangeLog
--- src/ChangeLog	2 Sep 2003 01:50:07 -0000	1.1863
+++ src/ChangeLog	3 Sep 2003 16:27:13 -0000
@@ -1,3 +1,7 @@
+2003-09-03  Dan Winship  <danw ximian com>
+
+	* Makefile.am (testgtkhtml_LDFLAGS): Remove -static again
+
 2003-09-02  Maxx Cao  <maxx cao sun com>
 	* gtkhtml.c (focus): reset selection when focus moved
 	(move_selection):  add consideration for caret mode
@@ -9,7 +13,7 @@
 	* htmlselection.c (remove_mark): consider caret mode
 
 2003-09-01  Yuedong Du  <yuedong du sun com>
-                                                                                
+
         * htmlobject.c: (destroy), (copy), (html_object_init),
         (html_object_get_index), (html_object_set_data_nocp),
         (html_object_set_data_full_nocp), (html_object_get_data_nocp): add
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/Makefile.am,v
retrieving revision 1.137
diff -u -r1.137 Makefile.am
--- src/Makefile.am	25 Jul 2003 21:32:29 -0000	1.137
+++ src/Makefile.am	3 Sep 2003 16:27:13 -0000
@@ -209,7 +209,6 @@
 	testgtkhtml.c		\
 	htmlurl.h		\
 	htmlurl.c
-testgtkhtml_LDFLAGS = -static
 testgtkhtml_LDADD =					\
 	libgtkhtml- GTKHTML_RELEASE@.la			\
 	../a11y/libgtkhtml-a11y- GTKHTML_RELEASE@.la 	\

Follow-Ups:
- Re: [evolution-patches] gal and gtkhtml Makefile patches for Darwin
  - From: Larry Ewing
- Re: [evolution-patches] gal and gtkhtml Makefile patches for Darwin
  - From: Rodney Dawes
- Re: [evolution-patches] gal and gtkhtml Makefile patches for Darwin
  - From: Mike Kestner
- Re: [evolution-patches] gal and gtkhtml Makefile patches for Darwin
  - From: Dan Winship

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]