utils/hwinfo/patches/3-assorted-Makefile-butchery

   1 Some makefile modifications to:
   2 >>disable the logic that detects and sets architecture (it screws up cross-compiling)
   3 >>disable some secondary build functions like creating changelogs or report files for other tools
   4 >>disable the install functionality as we take the files we need with OpenWrt build system
   5 >>changes to all makefiles to respect the compile flags
   6
   7 --- a/Makefile
   8 +++ b/Makefile
   9 @@ -1,6 +1,6 @@
  10  TOPDIR         = $(CURDIR)
  11  SUBDIRS                = src
  12 -TARGETS                = hwinfo hwinfo.pc changelog
  13 +TARGETS                = hwinfo
  14  CLEANFILES     = hwinfo hwinfo.pc hwinfo.static hwscan hwscan.static hwscand hwscanqueue doc/libhd doc/*~
  15  LIBS           = -lhd
  16  SLIBS          = -lhd -luuid
  17 @@ -18,11 +18,11 @@
  18
  19  include Makefile.common
  20
  21 -ifeq "$(ARCH)" "x86_64"
  22 -LIBDIR         ?= /usr/lib64
  23 -else
  24 +#ifeq "$(ARCH)" "x86_64"
  25 +#LIBDIR                ?= /usr/lib64
  26 +#else
  27  LIBDIR         ?= /usr/lib
  28 -endif
  29 +#endif
  30  ULIBDIR                = $(LIBDIR)
  31
  32  # this library has been removed from the code, disabling it here too
  33 @@ -39,13 +39,13 @@
  34
  35  .PHONY:        fullstatic static shared tiny doc diet tinydiet uc tinyuc
  36
  37 -ifdef HWINFO_VERSION
  38 +#ifdef HWINFO_VERSION
  39  changelog:
  40         @true
  41 -else
  42 -changelog: $(GITDEPS)
  43 -       $(GIT2LOG) --changelog changelog
  44 -endif
  45 +#else
  46 +#changelog: $(GITDEPS)
  47 +#      $(GIT2LOG) --changelog changelog
  48 +#endif
  49
  50  hwscan: hwscan.o $(LIBHD)
  51         $(CC) hwscan.o $(LDFLAGS) $(CFLAGS) $(LIBS) -o $@
  52 @@ -99,28 +99,29 @@
  53         @cd doc ; doxygen libhd.doxy
  54
  55  install:
  56 -       install -d -m 755 $(DESTDIR)/sbin $(DESTDIR)/usr/sbin $(DESTDIR)$(ULIBDIR) \
  57 -               $(DESTDIR)$(ULIBDIR)/pkgconfig $(DESTDIR)/usr/include
  58 -       install -m 755 hwinfo $(DESTDIR)/usr/sbin
  59 -       install -m 755 src/ids/check_hd $(DESTDIR)/usr/sbin
  60 -       install -m 755 src/ids/convert_hd $(DESTDIR)/usr/sbin
  61 -       if [ -f $(LIBHD_SO) ] ; then \
  62 -               install $(LIBHD_SO) $(DESTDIR)$(ULIBDIR) ; \
  63 -               ln -snf $(LIBHD_NAME) $(DESTDIR)$(ULIBDIR)/$(LIBHD_SONAME) ; \
  64 -               ln -snf $(LIBHD_SONAME) $(DESTDIR)$(ULIBDIR)/$(LIBHD_BASE).so ; \
  65 -       else \
  66 -               install -m 644 $(LIBHD) $(DESTDIR)$(ULIBDIR) ; \
  67 -       fi
  68 -       install -m 644 hwinfo.pc $(DESTDIR)$(ULIBDIR)/pkgconfig
  69 -       install -m 644 src/hd/hd.h $(DESTDIR)/usr/include
  70 -       perl -pi -e "s/define\s+HD_VERSION\b.*/define HD_VERSION\t\t$(LIBHD_MAJOR_VERSION)/" $(DESTDIR)/usr/include/hd.h
  71 -       perl -pi -e "s/define\s+HD_MINOR_VERSION\b.*/define HD_MINOR_VERSION\t$(LIBHD_MINOR_VERSION)/" $(DESTDIR)/usr/include/hd.h
  72 -       install -m 755 getsysinfo $(DESTDIR)/usr/sbin
  73 -       install -m 755 src/isdn/cdb/mk_isdnhwdb $(DESTDIR)/usr/sbin
  74 -       install -d -m 755 $(DESTDIR)/usr/share/hwinfo
  75 -       install -d -m 755 $(DESTDIR)/var/lib/hardware/udi
  76 -       install -m 644 src/isdn/cdb/ISDN.CDB.txt $(DESTDIR)/usr/share/hwinfo
  77 -       install -m 644 src/isdn/cdb/ISDN.CDB.hwdb $(DESTDIR)/usr/share/hwinfo
  78 +#      install -d -m 755 $(DESTDIR)/sbin $(DESTDIR)/usr/sbin $(DESTDIR)$(ULIBDIR) \
  79 +#              $(DESTDIR)$(ULIBDIR)/pkgconfig $(DESTDIR)/usr/include
  80 +#      install -m 755 hwinfo $(DESTDIR)/usr/sbin
  81 +#      install -m 755 src/ids/check_hd $(DESTDIR)/usr/sbin
  82 +#      install -m 755 src/ids/convert_hd $(DESTDIR)/usr/sbin
  83 +#      if [ -f $(LIBHD_SO) ] ; then \
  84 +#              install $(LIBHD_SO) $(DESTDIR)$(ULIBDIR) ; \
  85 +#              ln -snf $(LIBHD_NAME) $(DESTDIR)$(ULIBDIR)/$(LIBHD_SONAME) ; \
  86 +#              ln -snf $(LIBHD_SONAME) $(DESTDIR)$(ULIBDIR)/$(LIBHD_BASE).so ; \
  87 +#      else \
  88 +#              install -m 644 $(LIBHD) $(DESTDIR)$(ULIBDIR) ; \
  89 +#      fi
  90 +#      install -m 644 hwinfo.pc $(DESTDIR)$(ULIBDIR)/pkgconfig
  91 +#      install -m 644 src/hd/hd.h $(DESTDIR)/usr/include
  92 +#      perl -pi -e "s/define\s+HD_VERSION\b.*/define HD_VERSION\t\t$(LIBHD_MAJOR_VERSION)/" $(DESTDIR)/usr/include/hd.h
  93 +#      perl -pi -e "s/define\s+HD_MINOR_VERSION\b.*/define HD_MINOR_VERSION\t$(LIBHD_MINOR_VERSION)/" $(DESTDIR)/usr/include/hd.h
  94 +#      install -m 755 getsysinfo $(DESTDIR)/usr/sbin
  95 +#      install -m 755 src/isdn/cdb/mk_isdnhwdb $(DESTDIR)/usr/sbin
  96 +#      install -d -m 755 $(DESTDIR)/usr/share/hwinfo
  97 +#      install -d -m 755 $(DESTDIR)/var/lib/hardware/udi
  98 +#      install -m 644 src/isdn/cdb/ISDN.CDB.txt $(DESTDIR)/usr/share/hwinfo
  99 +#      install -m 644 src/isdn/cdb/ISDN.CDB.hwdb $(DESTDIR)/usr/share/hwinfo
 100 +       @true
 101
 102  archive: changelog
 103         @if [ ! -d .git ] ; then echo no git repo ; false ; fi
 104
 105 --- a/Makefile.common
 106 +++ b/Makefile.common
 107 @@ -1,28 +1,26 @@
 108  # libhd/Makefile.common
 109
 110 -ARCH   := $(shell uname -m)
 111 -ifeq "$(ARCH)" "i486"
 112 -ARCH   := i386
 113 -endif
 114 -ifeq "$(ARCH)" "i586"
 115 -ARCH   := i386
 116 -endif
 117 -ifeq "$(ARCH)" "i686"
 118 -ARCH   := i386
 119 -endif
 120 -ifeq "$(ARCH)" "parisc"
 121 -EXTRA_FLAGS := -fPIC $(EXTRA_FLAGS)
 122 -endif
 123 +#ARCH  := $(shell uname -m)
 124 +#ifeq "$(ARCH)" "i486"
 125 +#ARCH  := i386
 126 +#endif
 127 +#ifeq "$(ARCH)" "i586"
 128 +#ARCH  := i386
 129 +#endif
 130 +#ifeq "$(ARCH)" "i686"
 131 +#ARCH  := i386
 132 +#endif
 133 +#ifeq "$(ARCH)" "parisc"
 134 +#EXTRA_FLAGS := -fPIC $(EXTRA_FLAGS)
 135 +#endif
 136
 137  LIBHD_VERSION          := $(shell cat $(TOPDIR)/VERSION)
 138  LIBHD_MINOR_VERSION    := $(shell cut -d . -f 2 $(TOPDIR)/VERSION)
 139  LIBHD_MAJOR_VERSION    := $(shell cut -d . -f 1 $(TOPDIR)/VERSION)
 140
 141 -RPM_OPT_FLAGS  ?= -O2
 142 -
 143  CC     ?= gcc
 144  LD     = ld
 145 -CFLAGS += $(RPM_OPT_FLAGS) -Wall -Wno-pointer-sign -pipe -g $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd
 146 +CFLAGS += -Wall -Wno-pointer-sign $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd
 147  SHARED_FLAGS   = -fPIC
 148
 149  LDFLAGS        += -Lsrc
 150 @@ -36,7 +34,7 @@
 151  LIBHD_SO       = $(TOPDIR)/src/$(LIBHD_NAME)
 152  LIBHD_D                = $(TOPDIR)/src/.lib
 153
 154 -export CC TOPDIR CFLAGS LIBHD ARCH
 155 +export CC TOPDIR CFLAGS LIBHD
 156
 157  .PHONY: all distclean clean install subdirs
 158
 159
 160 --- a/src/Makefile
 161 +++ b/src/Makefile
 162 @@ -12,7 +12,7 @@
 163  #endif
 164
 165  $(LIBHD): $(OBJS)
 166 -       ar r $@ $?
 167 +       $(AR) r $@ $?
 168         @rm -f $(LIBHD_D)
 169
 170  ifdef SHARED_FLAGS
 171 --- a/src/hd/Makefile
 172 +++ b/src/hd/Makefile
 173 @@ -12,4 +12,4 @@
 174         @perl -pi -e "s/define\s+HD_MINOR_VERSION\s+\d+/define HD_MINOR_VERSION\t$(LIBHD_MINOR_VERSION)/" $@
 175
 176  $(LIBHD_D): $(OBJS)
 177 -       ar r $(LIBHD) $?
 178 +       $(AR) r $(LIBHD) $?
 179
 180 --- a/src/isdn/Makefile
 181 +++ b/src/isdn/Makefile
 182 @@ -5,5 +5,5 @@
 183  include $(TOPDIR)/Makefile.common
 184
 185  $(LIBHD_D): $(OBJS)
 186 -       ar r $(LIBHD) $?
 187 +       $(AR) r $(LIBHD) $?
 188
 189 --- a/src/smp/Makefile
 190 +++ b/src/smp/Makefile
 191 @@ -4,4 +4,4 @@
 192  include $(TOPDIR)/Makefile.common
 193
 194  $(LIBHD_D): $(OBJS)
 195 -       ar r $(LIBHD) $?
 196 +       $(AR) r $(LIBHD) $?
 197