Changeset 22381


Ignore:
Timestamp:
2010-07-24T23:38:10+02:00 (8 years ago)
Author:
florian
Message:

[package] uclibc++: parallel build fix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/uclibc++/Makefile

    r21480 r22381  
    1717 
    1818PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION) 
     19 
     20PKG_INSTALL:=1 
    1921 
    2022include $(INCLUDE_DIR)/package.mk 
     
    6163endef 
    6264 
    63 define Build/Compile 
    64         $(MAKE) -C $(PKG_BUILD_DIR) \ 
    65                 $(MAKE_FLAGS) \ 
    66                 DESTDIR="$(PKG_INSTALL_DIR)/usr" \ 
    67                 all install 
    68 endef 
    69  
    7065define Build/InstallDev 
    7166        $(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib 
    72         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(2)/bin/ 
    73         $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/uClibc++/ 
    74         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(1)/usr/lib/ 
     67        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/g++-uc $(2)/bin/ 
     68        $(CP) $(PKG_INSTALL_DIR)/include/* $(1)/usr/include/uClibc++/ 
     69        $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++*.a $(1)/usr/lib/ 
    7570        $(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(2)/bin/g++-uc 
    7671        $(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(2)/bin/g++-uc 
     
    8479define Package/uclibcxx/install 
    8580        $(INSTALL_DIR) $(1)/usr/lib 
    86         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++.so.* $(1)/usr/lib/ 
    87         $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++-*.so $(1)/usr/lib/ 
     81        $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++.so.* $(1)/usr/lib/ 
     82        $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++-*.so $(1)/usr/lib/ 
    8883endef 
    8984 
Note: See TracChangeset for help on using the changeset viewer.