Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/rsyslog/patches/tests-Makefile.in.patch
author John Beck <John.Beck@Oracle.COM>
Wed, 27 Feb 2013 10:50:04 -0800
changeset 1179 b369a62b28b6
permissions -rw-r--r--
16398558 rsyslog tests fail to build
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1179
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     1
 
# This patch has been submitted upstream; it may appear in a future release.
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     2
 
# At such time, the patch can be removed.
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     3
 
#
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     4
 
--- rsyslog/tests/Makefile.in	Mon Jan  9 06:15:51 2012
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     5
 
+++ rsyslog/tests/Makefile.in	Fri Aug 31 14:02:58 2012
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     6
 
@@ -759,11 +759,13 @@
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     7
 
 nettester_LDADD = $(SOL_LIBS)
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     8
 
 rt_init_SOURCES = rt-init.c $(test_files)
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
     9
 
 rt_init_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    10
 
-rt_init_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) $(SOL_LIBS)
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    11
 
+rt_init_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) $(SOL_LIBS) \
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    12
 
+	$(LIBESTR_LIBS)
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    13
 
 rt_init_LDFLAGS = -export-dynamic
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    14
 
 rscript_SOURCES = rscript.c getline.c $(test_files)
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    15
 
 rscript_CPPFLAGS = -I$(top_srcdir) $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    16
 
-rscript_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) $(SOL_LIBS)
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    17
 
+rscript_LDADD = $(RSRT_LIBS) $(ZLIB_LIBS) $(PTHREADS_LIBS) $(SOL_LIBS) \
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    18
 
+	$(LIBESTR_LIBS)
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    19
 
 rscript_LDFLAGS = -export-dynamic
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    20
 
 all: all-am
b369a62b28b6 16398558 rsyslog tests fail to build
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset 
    21
upstream/oracle/userland-gate