summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-01-20 22:52:19 +0000
committerEric Andersen <andersen@codepoet.org>2003-01-20 22:52:19 +0000
commit075eb13aa98aced33cc5aefc3e232056eca092c6 (patch)
tree09f658c789e4d85d2821aa2e959465f1b3858ec8
parentb4366afb5020f10738c43d4e4471be1e4d94aac3 (diff)
Minor fixes
-rw-r--r--make/linux.mk3
-rw-r--r--make/slang.mk3
2 files changed, 5 insertions, 1 deletions
diff --git a/make/linux.mk b/make/linux.mk
index 271159e57..8b89806d8 100644
--- a/make/linux.mk
+++ b/make/linux.mk
@@ -43,8 +43,10 @@ $(DL_DIR)/$(LINUX_SOURCE):
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
rm -rf $(LINUX_DIR)
bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
# Rename the dir from the downloaded version to the AFTER patch version
mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(BUILD_DIR)/linux-$(LINUX_VERSION)
+endif
mkdir -p $(SOURCE_DIR)/kernel-patches
$(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR)/kernel-patches
-(cd $(BUILD_DIR); ln -sf $(LINUX_DIR) linux)
@@ -75,6 +77,7 @@ $(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
$(LINUX_KERNEL): $(LINUX_DIR)/$(LINUX_BINLOC)
cp -fa $(LINUX_DIR)/$(LINUX_BINLOC) $(LINUX_KERNEL)
+ touch -c $(LINUX_KERNEL)
$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(LINUX_KERNEL)
rm -rf $(TARGET_DIR)/lib/modules
diff --git a/make/slang.mk b/make/slang.mk
index 224061e9c..6dc1b287b 100644
--- a/make/slang.mk
+++ b/make/slang.mk
@@ -9,6 +9,7 @@ SLANG_DIR=$(BUILD_DIR)/slang-1.4.5-mini
ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true)
SLANG_CFLAGS=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
endif
+SLANG_CFLAGS+="-fPIC"
$(DL_DIR)/$(SLANG_SOURCE):
$(WGET) -P $(DL_DIR) $(SLANG_SITE)/$(SLANG_SOURCE)
@@ -17,7 +18,7 @@ $(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE)
bzcat $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) -xvf -
$(SLANG_DIR)/libslang.so: $(SLANG_DIR)
- $(MAKE) CFLAGS="-Os -g -fPIC $(SLANG_CFLAGS)" CC=$(TARGET_CC) -C $(SLANG_DIR)
+ $(MAKE) CFLAGS="-Os -g $(SLANG_CFLAGS)" CC=$(TARGET_CC) -C $(SLANG_DIR)
touch -c $(SLANG_DIR)/libslang.so;
$(STAGING_DIR)/lib/libslang.so.1: $(SLANG_DIR)/libslang.so