Date:2012-03-25 01:30:42 (12 years 4 days ago)
Author:David Kühling
Commit:2fb5cdb01bd2f457586de5ad82e600f38517a2c6
Message:plplot: fix compilation on latest openwrt toolchain demo packages failed to link properly when compiled from the install target. Do we have a problem wih plplot-qt? Doesn't seem to detect qt here.

Files: plplot/Makefile (1 diff)

Change Details

plplot/Makefile
363363endef
364364
365365# ugly, but necessary: compiling demo-programs on install, using the just
366# installed libs.
366# installed libs. Note that the PKG_CONFIG_ENV= override used below sets
367# environment variables that would usually be handled by openwrt's
368# include/package.mk (Build/Exports/Default), but aren't available for the
369# install targets.
367370define Package/plplot-demo/install
368    $(SED) 's;/usr/lib/pkgconfig;$(STAGING_DIR)/usr/lib/pkgconfig;g' \
369        $(PKG_INSTALL_DIR)/usr/share/plplot$(PKG_VERSION)/examples/c/Makefile
370371    $(MAKE) -C $(PKG_INSTALL_DIR)/usr/share/plplot$(PKG_VERSION)/examples/c/ \
371372         C_INCLUDE_PATH=$(STAGING_DIR)/usr/include/plplot \
372373         CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CFLAGS) $(TARGET_LDFLAGS)"\
373        RPATHCMD=
374
374        RPATHCMD= \
375            PKG_CONFIG_ENV="STAGING_PREFIX=$(STAGING_DIR)/usr PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) PKG_CONFIG_LIBDIR=$(PKG_CONFIG_PATH)"
375376    $(INSTALL_DIR) $(1)/usr/bin
376377    $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/plplot$(PKG_VERSION)/examples/c/x??c \
377378        $(1)/usr/bin/

Archive Download the corresponding diff file



interactive