components/gnome/yelp/patches/02-ld-errors.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Tue, 23 Aug 2016 11:48:13 -0700
changeset 6671 ff9eef4eda6b
permissions -rw-r--r--
23245363 Move yelp to Userland and update to 3.18.0 PSARC/2016/288 Gnome 3 documentation
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6671
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     1
Specifying libyelpcommon to link against is redundant as libyelp.la will
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     2
already cause that to happen.  Since yelp enables --fatal-warnings for
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     3
the Solaris linker, the build will fail since libyelpcommon is included
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     4
multiple times.
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     5
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     6
file upstream bug
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     7
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     8
--- yelp-3.17.3/src/Makefile.am	2015-06-23 01:49:55.000000000 -0700
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     9
+++ yelp-3.17.3/src/Makefile.am	2015-07-15 15:33:51.709253518 -0700
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    10
@@ -26,7 +26,6 @@
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    11
 
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    12
 yelp_LDADD =					\
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    13
 	$(top_builddir)/libyelp/libyelp.la	\
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    14
-	$(top_builddir)/libyelp/libyelpcommon.la	\
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    15
 	$(YELP_LIBS)				\
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    16
 	$(POPT_LIBS)
ff9eef4eda6b 23245363 Move yelp to Userland and update to 3.18.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    17