0001-Fix-for-OE.patch 1.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364
  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. diff --git a/Makefile b/Makefile
  11. index dfc1a8a..a521db7 100644
  12. --- a/Makefile
  13. +++ b/Makefile
  14. @@ -12,7 +12,7 @@ OBJS= src/$T.o
  15. lib: src/lfs.so
  16. src/lfs.so: $(OBJS)
  17. - MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) -o src/lfs.so $(OBJS)
  18. + MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; $(CC) $(LIB_OPTION) ${LDFLAGS} -o src/lfs.so $(OBJS)
  19. test: lib
  20. LUA_CPATH=./src/?.so lua tests/test.lua
  21. diff --git a/config b/config
  22. index 2fc9a78..fd73f4a 100644
  23. --- a/config
  24. +++ b/config
  25. @@ -1,25 +1,25 @@
  26. # Installation directories
  27. # Default installation prefix
  28. -PREFIX=/usr/local
  29. +PREFIX ?= /usr/local
  30. # System's libraries directory (where binary libraries are installed)
  31. -LUA_LIBDIR= $(PREFIX)/lib/lua/5.1
  32. +LUAVER ?= `pkg-config --modversion lua | cut -d'.' -f1,2`
  33. +LUA_LIBDIR = $(PREFIX)/lib/lua/$(LUAVER)
  34. # Lua includes directory
  35. LUA_INC += -I$(PREFIX)/include
  36. LUA_INC += -I/usr/include/lua5.1
  37. +LUA_INC = `pkg-config --cflags lua`
  38. # OS dependent
  39. -LIB_OPTION= -shared #for Linux
  40. +LIB_OPTION= -shared ${LDFLAGS} #for Linux
  41. #LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
  42. LIBNAME= $T.so.$V
  43. # Compilation directives
  44. -WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -pedantic
  45. -INCS= $(LUA_INC)
  46. -CFLAGS= $(WARN) $(INCS)
  47. -CC= gcc
  48. +WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
  49. +CFLAGS += $(WARN) $(INCS) ${LUA_INC}
  50. # $Id: config,v 1.21 2007/10/27 22:42:32 carregal Exp $
  51. --
  52. 2.7.4