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/libffi/patches/Makefile_in.patch
author Sean Wilcox <sean.wilcox@oracle.com>
Tue, 08 Nov 2016 11:16:49 -0700
changeset 7264 86d356dd86aa
parent 7180 bc5351dcb9ac
permissions -rw-r--r--
20052404 Add log.exception() to our drivers for errors
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7180
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
     1
 
# Header files go in /usr/include. Will attempt to send upstream.
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
     2
 
# There is no way to configure to change the include path, as
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
     3
 
# --prefix does not work, so a patch is required.
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
     4
 
# Changed the pkg-config --cflags to point to the right directory
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
     5
 
--- libffi-3.2.1/include/Makefile.in_orig	2016-10-17 15:20:14.202082552 +0000
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
     6
 
+++ libffi-3.2.1/include/Makefile.in	2016-10-17 15:20:51.157615614 +0000
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
     7
 
@@ -314,7 +314,7 @@
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
     8
 
 AUTOMAKE_OPTIONS = foreign
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
     9
 
 DISTCLEANFILES = ffitarget.h
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    10
 
 EXTRA_DIST = ffi.h.in ffi_common.h
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    11
 
-includesdir = $(libdir)/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    12
 
+includesdir = @includedir@
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    13
 
 nodist_includes_HEADERS = ffi.h ffitarget.h
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    14
 
 all: all-am
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    15
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    16
 
--- libffi-3.2.1/libffi.pc.in_orig	2016-10-17 15:25:16.243588940 +0000
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    17
 
+++ libffi-3.2.1/libffi.pc.in	2016-10-17 15:25:28.673730084 +0000
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    18
 
@@ -2,7 +2,7 @@
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    19
 
 exec_prefix=@exec_prefix@
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    20
 
 libdir=@libdir@
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    21
 
 toolexeclibdir=@toolexeclibdir@
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    22
 
-includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    23
 
+includedir=@includedir@
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    24
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    25
 
 Name: @PACKAGE_NAME@
bc5351dcb9ac 16939859 libffi header files should be installed in /usr/include not /usr/lib
Binjih Lin <binjih.lin@oracle.com>
parents:
diff changeset 
    26
 
 Description: Library supporting Foreign Function Interfaces
upstream/oracle/userland-gate