open-src/lib/freetype/unix-cc.in.9.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Sun, 23 Nov 2014 21:46:46 -0800
changeset 1422 e9cadc0026d8
parent 1163 46339fe9f136
permissions -rw-r--r--
19461700 Split source & build subdirectories in X builds
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1422
e9cadc0026d8 19461700 Split source & build subdirectories in X builds
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1163
diff changeset
     1
# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
440
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6
Stefan Teleman <Stefan.Teleman@Sun.COM>
parents:
diff changeset
     2
#
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6
Stefan Teleman <Stefan.Teleman@Sun.COM>
parents:
diff changeset
     3
# Permission is hereby granted, free of charge, to any person obtaining a
919
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
     4
# copy of this software and associated documentation files (the "Software"),
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
     5
# to deal in the Software without restriction, including without limitation
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
     6
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
     7
# and/or sell copies of the Software, and to permit persons to whom the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
     8
# Software is furnished to do so, subject to the following conditions:
440
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6
Stefan Teleman <Stefan.Teleman@Sun.COM>
parents:
diff changeset
     9
#
919
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    10
# The above copyright notice and this permission notice (including the next
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    11
# paragraph) shall be included in all copies or substantial portions of the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    12
# Software.
440
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6
Stefan Teleman <Stefan.Teleman@Sun.COM>
parents:
diff changeset
    13
#
919
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    14
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    15
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    16
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    17
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    18
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    19
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents: 780
diff changeset
    20
# DEALINGS IN THE SOFTWARE.
993
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    21
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    22
Call compiler directly to build & link, avoiding libtool, so we can pass
1422
e9cadc0026d8 19461700 Split source & build subdirectories in X builds
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1163
diff changeset
    23
the compiler & linker flags we want, since delibtoolize.pl doesn't work
e9cadc0026d8 19461700 Split source & build subdirectories in X builds
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1163
diff changeset
    24
with freetype's unique Makefile/*.mk structure.
993
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    25
1163
46339fe9f136 7059382 Upgrade FreeType from 2.4.4 to 2.4.5
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 993
diff changeset
    26
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
46339fe9f136 7059382 Upgrade FreeType from 2.4.4 to 2.4.5
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 993
diff changeset
    27
index b84bc5d..d6c19bc 100644
46339fe9f136 7059382 Upgrade FreeType from 2.4.4 to 2.4.5
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 993
diff changeset
    28
--- a/builds/unix/unix-cc.in
46339fe9f136 7059382 Upgrade FreeType from 2.4.4 to 2.4.5
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 993
diff changeset
    29
+++ b/builds/unix/unix-cc.in
46339fe9f136 7059382 Upgrade FreeType from 2.4.4 to 2.4.5
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 993
diff changeset
    30
@@ -22,7 +22,7 @@ LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
993
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    31
 # The object file extension (for standard and static libraries).  This can be
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    32
 # .o, .tco, .obj, etc., depending on the platform.
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    33
 #
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    34
-O  := lo
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    35
+O  := o
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    36
 SO := o
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    37
 
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    38
 
1163
46339fe9f136 7059382 Upgrade FreeType from 2.4.4 to 2.4.5
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 993
diff changeset
    39
@@ -36,7 +36,7 @@ E := @EXEEXT@
993
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    40
 # The library file extension (for standard and static libraries).  This can
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    41
 # be .a, .lib, etc., depending on the platform.
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    42
 #
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    43
-A  := la
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    44
+A  := so.6
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    45
 SA := a
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    46
 
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    47
 
1163
46339fe9f136 7059382 Upgrade FreeType from 2.4.4 to 2.4.5
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 993
diff changeset
    48
@@ -85,11 +85,11 @@ CFLAGS   := -c @XX_CFLAGS@ @CFLAGS@ -DFT_CONFIG_CONFIG_H="<ftconfig.h>"
993
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    49
 #
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    50
 ANSIFLAGS := @XX_ANSIFLAGS@
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    51
 
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    52
-# C compiler to use -- we use libtool!
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    53
+# C compiler to use -- we hate libtool!
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    54
 #
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    55
 #
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    56
 CCraw := $(CC)
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    57
-CC    := $(LIBTOOL) --mode=compile $(CCraw)
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    58
+CC    := $(CCraw) -Kpic
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    59
 
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    60
 # Linker flags.
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    61
 #
1163
46339fe9f136 7059382 Upgrade FreeType from 2.4.4 to 2.4.5
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 993
diff changeset
    62
@@ -106,9 +106,8 @@ CCexe        := $(CCraw_build)	# used to compile `apinames' only
440
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6
Stefan Teleman <Stefan.Teleman@Sun.COM>
parents:
diff changeset
    63
 
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6
Stefan Teleman <Stefan.Teleman@Sun.COM>
parents:
diff changeset
    64
 # Library linking
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6
Stefan Teleman <Stefan.Teleman@Sun.COM>
parents:
diff changeset
    65
 #
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6
Stefan Teleman <Stefan.Teleman@Sun.COM>
parents:
diff changeset
    66
-LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
993
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    67
-                          -rpath $(libdir) -version-info $(version_info) \
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    68
-                          $(LDFLAGS) -no-undefined \
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    69
-                          # -export-symbols $(EXPORTS_LIST)
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    70
+LINK_LIBRARY = $(CCraw) -G @CFLAGS@ -o $@ $(OBJECTS_LIST) \
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    71
+                          -R $(libdir) -h $(@F) -mc \
1422
e9cadc0026d8 19461700 Split source & build subdirectories in X builds
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 1163
diff changeset
    72
+                          $(LDFLAGS) -z defs
993
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    73
 
76fc606af704 6975036 Update freetype to 2.4.1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents: 943
diff changeset
    74
 # EOF