mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
51 lines
1.2 KiB
Diff
51 lines
1.2 KiB
Diff
diff -r 724cf5abf164 host/Makefile
|
|
--- a/host/Makefile Mon Oct 28 00:43:49 2013 +0100
|
|
+++ b/host/Makefile Mon Oct 28 00:54:01 2013 +0100
|
|
@@ -19,7 +19,7 @@
|
|
RM ?= rm -f
|
|
LUA_V ?= 5.1
|
|
EXTRA_INC ?=
|
|
-LUA_INC ?= -I/usr/include/lua5.1
|
|
+LUA_INC ?= -I/usr/include
|
|
LIBDL ?= -ldl
|
|
PTHFLAGS ?=
|
|
PTHLIBS ?= -lpthread
|
|
@@ -31,7 +31,7 @@
|
|
MANZEXT := .gz
|
|
|
|
# Current tool version as returned from tools
|
|
-EKEYD_VERSION_S="1.1.4"
|
|
+EKEYD_VERSION_S="1.1.5"
|
|
|
|
# Attempt to detect an OS and set build options as appropriate
|
|
OSNAME=$(shell uname -s | tr A-Z a-z | tr -d /)
|
|
@@ -91,10 +91,7 @@
|
|
override MANZCMD:=cat
|
|
override MANZEXT:=
|
|
endif
|
|
-override LUA_INC:=-I/usr/local/include/lua51
|
|
override LIBDL:=
|
|
-LIBDIRS += -L/usr/local/lib
|
|
-INCLUDES += -I/usr/local/include
|
|
endif
|
|
endif
|
|
endif
|
|
@@ -114,7 +111,7 @@
|
|
CFLAGS += '-DEKEYD_VERSION_S=""$(EKEYD_VERSION_S)""'
|
|
CFLAGS += $(EXTRA_CFLAGS)
|
|
|
|
-LIBS += -llua$(LUA_V) -lm $(LIBDL)
|
|
+LIBS += -llua -lm $(LIBDL)
|
|
LDFLAGS += $(LIBDIRS)
|
|
|
|
|
|
@@ -157,7 +154,7 @@
|
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
|
|
|
|
control.inc: bin2c.lua control.lua
|
|
- lua$(LUA_V) bin2c.lua +control.lua result > control.inc.new
|
|
+ lua bin2c.lua +control.lua result > control.inc.new
|
|
mv control.inc.new control.inc
|
|
|
|
lstate.o: lstate.c control.inc
|