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/apr-util/patches/makefile-out.patch
author Drew Fisher <drew.fisher@oracle.com>
Mon, 31 Mar 2014 16:44:02 -0700
branchs11-update
changeset 3028 5e73a3a3f66a
parent 2623 948dde330876
permissions -rw-r--r--
PSARC/2013/350 OpenStack for Solaris (Umbrella) PSARC/2014/007 OpenStack client API components for Grizzly PSARC/2014/048 OpenStack Keystone (OpenStack Identity Service) PSARC/2014/049 OpenStack Nova (OpenStack Compute Service) PSARC/2014/054 OpenStack Cinder (OpenStack Block Storage Service) PSARC/2014/055 OpenStack Glance (OpenStack Image Service) PSARC/2014/058 OpenStack Horizon (OpenStack Dashboard) PSARC/2014/059 OpenStack Neutron (OpenStack Networking Service) 17531161 greenlet doesn't build with gcc 4.7.X 18143276 greenlet can crash with register window corruption on MP SPARC 18290089 integrate cinderclient 18290097 integrate glanceclient 18290102 integrate keystoneclient 18290109 integrate neutronclient 18290113 integrate novaclient 18290119 integrate swiftclient 18290125 integrate quantumclient 18307582 Request to integrate Cinder into userland 18307595 Request to integrate Glance into userland 18307626 Request to integrate Horizon into userland 18307641 Request to integrate Keystone into userland 18307650 Request to integrate Neutron into userland 18307659 Request to integrate Nova into userland 18321909 a few Python packages deliver both po and mo files 18362900 Dnsmasq's SMF method_credential is missing a privilege 18363793 Dnsmasq should use SIOCSXARP ioctl
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2623
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     1
 
--- Makefile.in	Thu Nov 20 22:32:58 2008
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     2
 
+++ Makefile.in	Thu Nov 10 05:02:25 2011
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     3
 
@@ -10,7 +10,7 @@
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     4
 
 srcdir = @srcdir@
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     5
 
 VPATH = @srcdir@
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     6
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     7
 
-INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     8
 
+INCLUDES = -I/usr/include/openldap @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
     9
 
 APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
    10
 
 APRUTIL_LIBS = @APRUTIL_LIBS@
948dde330876 PSARC 2012/327 Apache and APR-Util Using OpenLDAP
Petr Sumbera <petr.sumbera@oracle.com>
parents: 203
diff changeset 
    11
203
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    12
 
@@ -71,7 +71,10 @@
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    13
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    14
 
 # Create apu-config script suitable for the install tree
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    15
 
 apu-config.out: $(APU_CONFIG)
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    16
 
-	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    17
 
+	sed -e 's,^\(location=\).*$$,\1installed,' \
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    18
 
+	    -e '/^APU_SOURCE_DIR=/s,/.*",/usr/apr-util/1.3",' \
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    19
 
+	    -e '/^APU_BUILD_DIR=/s,/.*",/usr/apr-util/1.3",' \
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    20
 
+	     < $(APU_CONFIG) > $@
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    21
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    22
 
 install: $(TARGETS) install-modules
887f23af6934 7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset 
    23
 
 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
upstream/oracle/userland-gate