patch-Makefile 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. - allow passing libtool options via environment variables
  2. - drop hard-coded -rpath flag when linking with libtool (distracts tagged configs)
  3. --- cpufrequtils-007.orig/Makefile 2010-01-16 14:47:44.000000000 +0100
  4. +++ cpufrequtils-007/Makefile 2010-01-20 14:09:02.171177883 +0100
  5. @@ -147,11 +147,11 @@ CFLAGS += $(WARNINGS)
  6. ifeq ($(strip $(V)),false)
  7. QUIET=@$(PWD)/build/ccdv
  8. - LIBTOOL_OPT=--silent
  9. + LIBTOOL_OPT+=--silent
  10. HOST_PROGS=build/ccdv
  11. else
  12. QUIET=
  13. - LIBTOOL_OPT=
  14. + LIBTOOL_OPT+=
  15. HOST_PROGS=
  16. endif
  17. @@ -185,8 +185,8 @@ libcpufreq.la: $(LIB_OBJS) $(LIB_HEADERS
  18. echo '*** At least one of /sys support or /proc support MUST be enabled ***'; \
  19. exit -1; \
  20. fi;
  21. - $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o libcpufreq.la -rpath \
  22. - ${libdir} -version-info $(LIB_VERSION) $(LIB_PARTS)
  23. + $(QUIET) $(LIBTOOL) $(LIBTOOL_OPT) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) -rpath ${libdir} $(LDFLAGS) -o libcpufreq.la \
  24. + -version-info $(LIB_VERSION) $(LIB_PARTS)
  25. libcpufreq: libcpufreq.la
  26. @@ -232,7 +232,7 @@ clean:
  27. install-lib:
  28. $(INSTALL) -d $(DESTDIR)${libdir}
  29. - $(LIBTOOL) --mode=install $(INSTALL) libcpufreq.la $(DESTDIR)${libdir}/libcpufreq.la
  30. + sh -x $(LIBTOOL) --mode=install $(INSTALL) libcpufreq.la $(DESTDIR)${libdir}/libcpufreq.la
  31. $(INSTALL) -d $(DESTDIR)${includedir}
  32. $(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h