summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-09-09 14:19:38 +0000
committerEric Andersen <andersen@codepoet.org>2002-09-09 14:19:38 +0000
commit4ab6f8144e353ca90b51c8cfddf7c3b312a85759 (patch)
tree645d97522335b9ab2137ca7a0a5901ea81570cd2 /make
parent5a9f7f2b9cc2573123768aaf0ca591f60b4bf46a (diff)
Make stlport work once again
Diffstat (limited to 'make')
-rw-r--r--make/stlport.mk17
1 files changed, 5 insertions, 12 deletions
diff --git a/make/stlport.mk b/make/stlport.mk
index c0cd134aa..fecf90136 100644
--- a/make/stlport.mk
+++ b/make/stlport.mk
@@ -20,13 +20,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA
-
-# FYI -- to make things compile with this, you will need to
-# compile client applications by adding the following flags:
-# CFLAGS+=-I$(STAGING_DIR)/include/g++-3 -D_STLP_USE_UCLIBC -D_STLP_NO_WCHAR_T
-# LDFLAGS+=-lstdc++
-
-
STLPORT_DIR=$(BUILD_DIR)/STLport-4.5.3
STLPORT_SITE=http://www.stlport.org/archive
STLPORT_SOURCE=STLport-4.5.3.tar.gz
@@ -42,19 +35,19 @@ $(STLPORT_DIR)/Makefile: $(DL_DIR)/$(STLPORT_SOURCE) $(STLPORT_PATCH)
cat $(STLPORT_PATCH) | patch -d $(STLPORT_DIR) -p1
$(STLPORT_DIR)/lib/libstdc++.so.4.5: $(STLPORT_DIR)/Makefile
- $(MAKE) ARCH=$(ARCH) CROSS=$(TARGET_CROSS) -C $(STLPORT_DIR)
+ $(MAKE) ARCH=$(ARCH) PREFIX=$(STAGING_DIR) -C $(STLPORT_DIR)
$(STAGING_DIR)/lib/libstdc++.so.4.5: $(STLPORT_DIR)/lib/libstdc++.so.4.5
- $(MAKE) ARCH=$(ARCH) CROSS=$(TARGET_CROSS) PREFIX=$(STAGING_DIR) -C $(STLPORT_DIR) install
+ $(MAKE) ARCH=$(ARCH) PREFIX=$(STAGING_DIR) -C $(STLPORT_DIR) install
$(TARGET_DIR)/lib/libstdc++.so.4.5: $(STAGING_DIR)/lib/libstdc++.so.4.5
- cp -a $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/lib/
+ cp -pf $(STAGING_DIR)/lib/libstdc++.so* $(TARGET_DIR)/lib/
-stlport: linux $(TARGET_DIR)/lib/libstdc++.so.4.5
+stlport: $(TARGET_DIR)/lib/libstdc++.so.4.5
stlport-clean:
rm -f $(TARGET_DIR)/lib/libstdc++*
- -make -C $(STLPORT_DIR) clean
+ -$(MAKE) -C $(STLPORT_DIR) clean
stlport-dirclean:
rm -rf $(STLPORT_DIR)