Changeset 1746

Show
Ignore:
Timestamp:
05/31/03 16:42:48 (5 years ago)
Author:
mds
Message:

replace -idirafter with -nostdinc and other magic from the kernel

makefile. This prevents ever picking up headers from /usr/include
for module builds. Headers must be located in
/lib/modules/uname -r/build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/CHANGES

    r1738 r1746  
    2121  NOTE: Requires i2c-2.8.0 or newer. 
    2222  Dropped all kernel 2.2 and 2.3 compatibility; 2.4.9 or later required 
     23  File i2c-dev.h: Include userspace portion removed from i2c-dev.h in 
     24                  i2c package 
    2325  File sensors.conf.eg: Fix vt1211/vt8231 thermistor calculations 
    2426  Library: Add support for exponents and logarithms for vt1211/vt8235 temps; 
    25            add lm85 support 
     27           add lm85 support; add w83791d support 
    2628  Makefiles: Generate warnings if new library won't be found by ld.so; 
    2729             Modules now install in kernel/drivers/i2c/[busses,chips]; 
    28              Ensure that headers in /usr/local/include are used first 
     30             Ensure that headers in /usr/local/include are used first; 
     31             Don't use /usr/include headers for modules; 
     32             Handle multiple UTS_RELEASE definitions in linux/version.h 
    2933  Modules (all): Cleanups including 
    3034                - Add #include <i2c-proc.h> 
    …… 
    5862  Module w83627hf: New 
    5963  Program decode-dimms.pl: Recognize DDR and Rambus 
     64  Program eeprom: Fix writes for small eeproms 
     65  Program eeprom, eepromer: Use local i2c-dev.h for build 
    6066  Program lm_sensors.init: Call sensors -s in start() 
    6167  Program mkpatch: Fix vt8231 compile; keep tsunami from menu on non-alpha 
    6268  Program pwmtest: New 
    63   Program sensors: add lm85 support 
     69  Program sensors: add lm85 support; add w83791d support 
    6470  Program sensors-detect: Add super i/o detection (smsc47m1, vt1211, 
    6571                          w83627hf, w83697hf) 

  • lm-sensors/trunk/Makefile

    r1739 r1746  
    9191#MODPREF := /lib/modules/$(KERNELVERSION) 
    9292#MODPREF := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'` 
    93 MODPREF := /lib/modules/`$(CC) -I$(LINUX_HEADERS) -E etc/config.c | grep uts_release |cut -f 2 -d'"'` 
     93MODPREF := /lib/modules/$(shell $(CC) -I$(LINUX_HEADERS) -E etc/config.c | grep uts_release |cut -f 2 -d'"') 
    9494 
    9595# This is the directory where sensors.conf will be installed, if no other 
    …… 
    180180# ARCPPFLAGS/ARCFLAGS are used to create archive object files (static libraries). 
    181181# LIBCPPFLAGS/LIBCFLAGS are for shared library objects. 
    182 #ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -idirafter $(LINUX_HEADERS) 
    183182ALL_CPPFLAGS := -I. -Ikernel/include -I$(I2C_HEADERS) -I$(LINUX_HEADERS) 
    184183ALL_CFLAGS := -O2  
    …… 
    216215endif 
    217216 
    218 MODCPPFLAGS += -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -fomit-frame-pointer $(ALL_CPPFLAGS) 
     217# This magic is from the kernel Makefile. 
     218# Extra cflags for kbuild 2.4.  The default is to forbid includes by kernel code 
     219# from user space headers. 
     220kbuild_2_4_nostdinc := -nostdinc $(shell $(CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp') 
     221 
     222MODCPPFLAGS += -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -fomit-frame-pointer $(ALL_CPPFLAGS) $(kbuild_2_4_nostdinc) 
    219223MODCFLAGS += $(ALL_CFLAGS) 
    220224PROGCPPFLAGS := $(ALL_CPPFLAGS)