annotate src/log4cxx-2-pkgconfig.patch @ 3721:933b99febcf1

Expand options to support 3 possible sources of octave * configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default) * Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure. * index.html: added master-octave information. * src/default-octave.mk: new file. * src/default-octave-1-docinstall.patch * dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk * binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
author John Donoghue <john.donoghue@ieee.org>
date Sun, 19 Oct 2014 22:58:20 -0400
parents ebacbf52f15c
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2466
a7a203db74c5 packages apr, apr-util, log4cxx: various changes and add log4cxx test program
Tony Theodore <tonyt@logyst.com>
parents: 2465
diff changeset
1 This file is part of MXE.
2469
51a4ed33302d various packages: fix references to mingw-cross-env and doc/index.html
Tony Theodore <tonyt@logyst.com>
parents: 2466
diff changeset
2 See index.html for further information.
2465
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
3
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
4 This patch ensures that the correct dependencies can always be found for
2470
ebacbf52f15c add comments linking to the tickets submitted upstream for log4cxx patches.
Daniel Stonier <d.stonier@gmail.com>
parents: 2469
diff changeset
5 static mingw builds. Submitted upstream:
ebacbf52f15c add comments linking to the tickets submitted upstream for log4cxx patches.
Daniel Stonier <d.stonier@gmail.com>
parents: 2469
diff changeset
6
ebacbf52f15c add comments linking to the tickets submitted upstream for log4cxx patches.
Daniel Stonier <d.stonier@gmail.com>
parents: 2469
diff changeset
7 https://issues.apache.org/jira/browse/LOGCXX-381
2465
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
8
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
9 diff -NBaur vanilla/liblog4cxx.pc.in mingw_cross/liblog4cxx.pc.in
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
10 --- vanilla/liblog4cxx.pc.in 2008-04-01 07:34:52.000000000 +0900
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
11 +++ mingw_cross/liblog4cxx.pc.in 2011-05-09 10:31:00.175584637 +0900
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
12 @@ -20,6 +20,7 @@
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
13 Name: log4cxx
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
14 Description: log4cxx C++ logging framework
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
15 Version: @VERSION@
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
16 +Requires: apr-util-1, apr-1
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
17 Libs: -L${libdir} -llog4cxx
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
18 Cflags: -I${includedir}
c5d8bb3beb28 new packages: apr, apr-util, log4cxx
Daniel Stonier <d.stonier@gmail.com>
parents:
diff changeset
19