Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1019)

Side by Side Diff: dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch

Issue 6717026: Update m17n packages from Gentoo's main tree. (Closed) Base URL: http://git.chromium.org/git/portage-stable.git@master
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 Index: m17n-lib-1.6.2/src/Makefile.am
2 ===================================================================
3 --- m17n-lib-1.6.2.orig/src/Makefile.am
4 +++ m17n-lib-1.6.2/src/Makefile.am
5 @@ -53,7 +53,7 @@ libm17n_la_SOURCES = \
6 language.h language.c \
7 mlocale.h locale.c \
8 m17n.h m17n.c
9 -libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl
10 +libm17n_la_LIBADD = libm17n-core.la -ldl
11 libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
12
13 FLT_SOURCES = \
14 @@ -61,7 +61,7 @@ FLT_SOURCES = \
15 m17n-flt.h m17n-flt.c
16
17 libm17n_flt_la_SOURCES = ${FLT_SOURCES}
18 -libm17n_flt_la_LIBADD = ${top_builddir}/src/libm17n-core.la
19 +libm17n_flt_la_LIBADD = libm17n-core.la
20 libm17n_flt_la_LDFLAGS = -export-dynamic ${VINFO}
21
22 GUI_SOURCES = \
23 @@ -80,7 +80,7 @@ OPTIONAL_LD_FLAGS = \
24 @FONTCONFIG_LD_FLAGS@
25
26 libm17n_gui_la_SOURCES = ${GUI_SOURCES}
27 -libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_builddir}/src/libm17n-core.l a ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la
28 +libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} libm17n-core.la libm17n.la libm17n -flt.la
29 libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
30
31 if WITH_GUI
32 @@ -90,11 +90,11 @@ module_LTLIBRARIES = libm17n-X.la libm17
33 X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
34
35 libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
36 -libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_builddir}/src/libm17n -core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top _builddir}/src/libm17n-gui.la
37 +libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ libm17n-core.la libm17n.la libm17n-flt.la libm17n-gui.la
38 libm17n_X_la_LDFLAGS = -avoid-version -module
39
40 libm17n_gd_la_SOURCES = m17n-gd.c
41 -libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ ${top_builddir}/src/li bm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
42 +libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ libm17n-core.la libm17 n.la libm17n-flt.la libm17n-gui.la
43 libm17n_gd_la_LDFLAGS = -avoid-version -module
44
45 endif
46 @@ -121,14 +121,14 @@ if MAINTAINER_MODE
47 noinst_PROGRAMS = linkcore linkshell linkgui
48
49 linkcore_SOURCES = linkcore.c
50 -linkcore_LDADD = ${top_builddir}/src/libm17n-core.la
51 +linkcore_LDADD = libm17n-core.la
52 linkcore_LDFLAGS = -static
53
54 linkshell_SOURCES = linkshell.c
55 -linkshell_LDADD = ${top_builddir}/src/libm17n.la
56 +linkshell_LDADD = libm17n.la
57 linkshell_LDFLAGS = -static
58
59 linkgui_SOURCES = linkgui.c
60 -linkgui_LDADD = ${top_builddir}/src/libm17n-gui.la
61 +linkgui_LDADD = libm17n-gui.la
62 linkgui_LDFLAGS = -static
63 endif
OLDNEW
« no previous file with comments | « dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch ('k') | dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698