[Astlinux-commits] SF.net SVN: astlinux:[7401] branches/1.0/package

[<abe...@us...>]

Revision: 7401
          http://sourceforge.net/p/astlinux/code/7401
Author:   abelbeck
Date:     2015-12-13 15:13:55 +0000 (Sun, 13 Dec 2015)
Log Message:
-----------
build system, minor tweaks to cope with CentOS 7 as the build system

Modified Paths:
--------------
    branches/1.0/package/lm-sensors/lm-sensors-no-host-ldconfig.patch
    branches/1.0/package/rhino/rhino.mk

Modified: branches/1.0/package/lm-sensors/lm-sensors-no-host-ldconfig.patch
===================================================================
--- branches/1.0/package/lm-sensors/lm-sensors-no-host-ldconfig.patch	2015-12-13 14:50:37 UTC (rev 7400)
+++ branches/1.0/package/lm-sensors/lm-sensors-no-host-ldconfig.patch	2015-12-13 15:13:55 UTC (rev 7401)
@@ -21,7 +21,7 @@
 -
  $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME)
 -	$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors
-+	$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) -Llib -lsensors
++	$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) -Llib -lsensors -lm
  
  all-prog-sensors: $(PROGSENSORSTARGETS)
  user :: all-prog-sensors

Modified: branches/1.0/package/rhino/rhino.mk
===================================================================
--- branches/1.0/package/rhino/rhino.mk	2015-12-13 14:50:37 UTC (rev 7400)
+++ branches/1.0/package/rhino/rhino.mk	2015-12-13 15:13:55 UTC (rev 7401)
@@ -14,7 +14,6 @@
 RHINO_LEGACY_MODULES := r4fxo
 
 RHINO_PREREQS := dahdi-linux
-RHINO_CONFIGURE := DAHDI_DIR=$(DAHDI_LINUX_DIR)
 
 $(DL_DIR)/$(RHINO_SOURCE):
 	$(WGET) -P $(DL_DIR) $(RHINO_SITE)/$(RHINO_SOURCE)
@@ -37,7 +36,7 @@
 		KINCLUDES=$(STAGING_DIR)/include \
 		KINSTDIR=/lib/modules/$(LINUX_VERSION_PROBED)/kernel \
 		INSTALL_PREFIX=$(TARGET_DIR) \
-		$(RHINO_CONFIGURE) \
+		DAHDI_DIR=$(DAHDI_LINUX_DIR) \
 		all
 	touch $@
 
@@ -50,7 +49,7 @@
 		KINCLUDES=$(STAGING_DIR)/include \
 		KINSTDIR=/lib/modules/$(LINUX_VERSION_PROBED)/kernel \
 		INSTALL_PREFIX=$(TARGET_DIR) \
-		$(RHINO_CONFIGURE) \
+		DAHDI_DIR=$(DAHDI_LINUX_DIR) \
 		install
 	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
 	echo -e "#!/bin/sh\necho \""$(RHINO_VERSION)"\"" > $(TARGET_DIR)/$(RHINO_TARGET_BINARY)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.