Commit 0d6068ae authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'misc-fixes2' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 84278848 80396749

package/Makefile.in

+6 −0
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ ifeq ($(BR2_LARGEFILE),y) 
TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

endif



# Host packages are sometimes linked against host libraries installed

# in $(HOST_DIR)/usr/lib. As we cannot add $(HOST_DIR)/usr/lib to

# LD_LIBRARY_PATH when building target packages because it causes

# libtool breakage, we force a rpath to be added to host binaries.

HOST_CFLAGS+=-Wl,-rpath -Wl,$(HOST_DIR)/usr/lib



#########################################################################

ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
@@ -93,6 +98,7 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) 
TARGET_CFLAGS+=--sysroot $(STAGING_DIR)/

TARGET_CXXFLAGS=$(TARGET_CFLAGS)

TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/

TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib

endif

#########################################################################

package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk

+2 −0
Original line number Diff line number Diff line
@@ -9,5 +9,7 @@ XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2 
XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app

XAPP_BDFTOPCF_AUTORECONF = NO

XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont

HOST_XAPP_BDFTOPCF_DEPENDENCIES = host-xlib_libXfont



$(eval $(call AUTOTARGETS,package/x11r7,xapp_bdftopcf))

$(eval $(call AUTOTARGETS,package/x11r7,xapp_bdftopcf,host))

package/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk

+2 −0
Original line number Diff line number Diff line
@@ -9,5 +9,7 @@ XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2 
XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app

XAPP_MKFONTDIR_AUTORECONF = NO

XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale

HOST_XAPP_MKFONTDIR_DEPENDENCIES = host-xapp_mkfontscale



$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontdir))

$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontdir,host))

package/x11r7/xfont_encodings/xfont_encodings.mk

+2 −0
Original line number Diff line number Diff line
@@ -10,5 +10,7 @@ XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font 
XFONT_ENCODINGS_AUTORECONF = NO

XFONT_ENCODINGS_MAKE_OPT =

XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale

HOST_XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale



$(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings))

$(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings,host))

package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ XFONT_FONT_ADOBE_100DPI_VERSION = 1.0.1 
XFONT_FONT_ADOBE_100DPI_SOURCE = font-adobe-100dpi-$(XFONT_FONT_ADOBE_100DPI_VERSION).tar.bz2

XFONT_FONT_ADOBE_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font

XFONT_FONT_ADOBE_100DPI_AUTORECONF = NO

XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install

XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=/usr/bin/mkfontscale MKFONTDIR=/usr/bin/mkfontdir FCCACHE=/usr/bin/fc-cache install-data

XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util

XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install

XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data

XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf



$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-adobe-100dpi))