diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2012-06-14 04:55:10 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2012-06-14 04:55:10 +0000 |
| commit | daf20e3e65e477fb85b5c09541c0208f02ac219c (patch) | |
| tree | c2ea63a9b7c3757c099d23931baba566c4ccadf0 /app-i18n | |
| parent | Add USE=nls support to control gettext requirement. (diff) | |
| download | gentoo-2-daf20e3e65e477fb85b5c09541c0208f02ac219c.tar.gz gentoo-2-daf20e3e65e477fb85b5c09541c0208f02ac219c.tar.bz2 gentoo-2-daf20e3e65e477fb85b5c09541c0208f02ac219c.zip | |
Add patch to use LDFLAGS
(Portage version: 2.2.0_alpha109/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n')
| -rw-r--r-- | app-i18n/xvnkb/ChangeLog | 8 | ||||
| -rw-r--r-- | app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch | 34 | ||||
| -rw-r--r-- | app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild | 10 |
3 files changed, 48 insertions, 4 deletions
diff --git a/app-i18n/xvnkb/ChangeLog b/app-i18n/xvnkb/ChangeLog index a3f7c529a021..e6614abe50e1 100644 --- a/app-i18n/xvnkb/ChangeLog +++ b/app-i18n/xvnkb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/xvnkb -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.21 2009/01/07 15:33:14 matsuu Exp $ +# Copyright 2000-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/ChangeLog,v 1.22 2012/06/14 04:55:10 naota Exp $ + + 14 Jun 2012; Naohiro Aota <naota@gentoo.org> + +files/xvnkb-0.2.9a-ldflags.patch, xvnkb-0.2.9a-r1.ebuild: + Add patch to use LDFLAGS 07 Jan 2009; MATSUU Takuto <matsuu@gentoo.org> xvnkb-0.2.8a-r1.ebuild, -xvnkb-0.2.9a.ebuild, xvnkb-0.2.9a-r1.ebuild: diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch new file mode 100644 index 000000000000..f089f0dde899 --- /dev/null +++ b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch @@ -0,0 +1,34 @@ +diff --git a/Makefile.common b/Makefile.common +index 06f0b78..d9f8976 100644 +--- a/Makefile.common ++++ b/Makefile.common +@@ -19,10 +19,10 @@ all: do-it-all + $(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $< + + $(CORE): $(CORE_OBJS) +- $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) ++ $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS) + + $(GUI): $(GUI_OBJS) +- $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) ++ $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS) + + main: $(CORE) $(GUI) + @echo >/dev/null +diff --git a/tools/Makefile.common b/tools/Makefile.common +index fe16cc1..16ec511 100644 +--- a/tools/Makefile.common ++++ b/tools/Makefile.common +@@ -16,10 +16,10 @@ all: do-it-all + $(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $< + + xvnkb_ctrl: $(CONTROL_OBJS) +- $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS) + + xvnkb_setup: $(SETUP_OBJS) +- $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) ++ $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS) + + main-tools: $(TOOLS) + diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild index f298849ed515..51c3e0def87b 100644 --- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild +++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild,v 1.3 2009/01/07 15:33:14 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild,v 1.4 2012/06/14 04:55:10 naota Exp $ inherit eutils multilib toolchain-funcs @@ -19,6 +19,12 @@ RDEPEND="x11-libs/libX11 DEPEND="${RDEPEND} x11-proto/xproto" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-ldflags.patch +} + src_compile() { local myconf |