0001-Fix-for-OE.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. From c3154899776586c291dd9bc6369d7091efac19ff Mon Sep 17 00:00:00 2001
  2. From: Kas User <kas@example.com>
  3. Date: Mon, 14 May 2018 10:25:49 +0200
  4. Subject: [PATCH] Fix for OE
  5. Signed-off-by: Kas User <kas@example.com>
  6. ---
  7. Makefile | 2 +-
  8. config | 14 +++++++-------
  9. 2 files changed, 8 insertions(+), 8 deletions(-)
  10. --- a/Makefile
  11. +++ b/Makefile
  12. @@ -12,7 +12,7 @@ OBJS= src/$T.o
  13. lib: src/lfs.so
  14. src/lfs.so: $(OBJS)
  15. - MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS)
  16. + MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) ${LDFLAGS} -o src/lfs.so $(OBJS)
  17. test: lib
  18. LUA_CPATH=./src/?.so lua tests/test.lua
  19. --- a/config
  20. +++ b/config
  21. @@ -1,25 +1,25 @@
  22. # Installation directories
  23. # Default installation prefix
  24. -PREFIX=/usr/local
  25. -
  26. +PREFIX ?= /usr/local
  27. +BASELIB ?= /lib
  28. # System's libraries directory (where binary libraries are installed)
  29. -LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
  30. +LUAVER ?= `pkg-config --modversion lua | cut -d'.' -f1,2`
  31. +LUA_LIBDIR = $(PREFIX)$(BASELIB)/lua/$(LUAVER)
  32. # Lua includes directory
  33. LUA_INC += -I$(PREFIX)/include
  34. LUA_INC += -I/usr/include/lua5.1
  35. +LUA_INC = `pkg-config --cflags lua`
  36. # OS dependent
  37. -LIB_OPTION= -shared #for Linux
  38. +LIB_OPTION= -shared ${LDFLAGS} #for Linux
  39. #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
  40. LIBNAME= $T.so.$V
  41. # Compilation directives
  42. -WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
  43. -INCS= $(LUA_INC)
  44. -CFLAGS= $(WARN) $(INCS)
  45. -CC= gcc
  46. +WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
  47. +CFLAGS += $(WARN) $(INCS) ${LUA_INC}
  48. # $Id: config,v 1.21 2007/10/27 22:42:32 carregal Exp $