From 5fdddd286ab1991b394c05ed1aab017bf0b09319 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 19 Aug 2015 00:31:30 +0300 Subject: [PATCH 1/8] define BINDIR and DOCDIR used by install target --- standard_definitions.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/standard_definitions.mk b/standard_definitions.mk index b50dfc5..a22ca71 100644 --- a/standard_definitions.mk +++ b/standard_definitions.mk @@ -111,4 +111,5 @@ LINKDIR=-L/usr/xsrc/pkg/usr/lib PREDIR=/usr LIBDIR=$(DESTDIR)$(PREDIR)/lib INCDIR=$(DESTIR)$(PREDIR)/include - +BINDIR=$(DESTDIR)$(PREDIR)/bin +DOCDIR=$(DESTDIR)$(PREDIR)/doc From 054fbae29904ed40897427783a9de04748183e92 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 19 Aug 2015 00:32:08 +0300 Subject: [PATCH 2/8] define _DEFAULT_SOURCE to prevent numerous compile warnings see https://sourceware.org/glibc/wiki/Release/2.20 --- standard_definitions.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/standard_definitions.mk b/standard_definitions.mk index a22ca71..da5c60c 100644 --- a/standard_definitions.mk +++ b/standard_definitions.mk @@ -4,10 +4,10 @@ CC=/usr/bin/gcc #CC=/opt/musl/bin/musl-gcc ####compilerflags#### -COMPFLAGS=-pipe -fPIC -Os -Wall -D_BSD_SOURCE -D_GNU_SOURCE -D__KERNEL_STRICT_NAMES \ --fno-strength-reduce -nodefaultlibs -fno-strict-aliasing \ --ffunction-sections -fdata-sections \ --I. -I/usr/xsrc/pkg/usr/include +COMPFLAGS=-pipe -fPIC -Os -Wall -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE \ +-D__KERNEL_STRICT_NAMES -fno-strength-reduce -nodefaultlibs \ +-fno-strict-aliasing -ffunction-sections -fdata-sections -I. \ +-I/usr/xsrc/pkg/usr/include ####extensions#### From 0e128ad2de48bae140eacb2d5ca0c5c0ad4654ea Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 19 Aug 2015 00:33:12 +0300 Subject: [PATCH 3/8] add gitignore file from tinyxlib --- .gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2eb123b --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +*.o +*.a +*.so +*.swp +*.so* +*.pc +*.bak +*.org +*.orig +*.diff +*.log +*.rej From 2cdb956bc28d8ae1bb12e25a3b575b64fadf1e88 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 22 Oct 2015 01:06:51 +0300 Subject: [PATCH 4/8] add xinit to the default all target it is required by the install target so it makes sense to build it by default --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bed2526..156ec38 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ DEFS= -DNOERROR CFLAGS= -I.. -I../.. -I../../.. -I./include -I./common -I./render -I./Xext -I./lbx -I./fb -I./mi -I./miext/shadow -I./hw/kdrive -I./miext/layer -I./os $(COMMONDEFS) $(DEFS) OBJS= -all: core Xfbdev +all: core Xfbdev xinit core: cd render; make From 412bc1999a9919de1ad9b6a9f80306d60f34aa0c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 22 Oct 2015 01:09:22 +0300 Subject: [PATCH 5/8] fix xinit build, ensure LINKDIR is respected xinit needs to be linked to pthread because tiny X11 library uses it --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 156ec38..1455502 100644 --- a/Makefile +++ b/Makefile @@ -30,11 +30,11 @@ Xvesa: core Xfbdev: core cd hw/kdrive/fbdev; make - $(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o Xfbdev dix/libdix.a os/libos.a hw/kdrive/fbdev/libfbdev.a miext/layer/liblayer.a hw/kdrive/libkdrive.a hw/kdrive/linux/liblinux.a miext/shadow/libshadow.a fb/libfb.a mi/libmi.a Xext/libext.a Xext/extmod/libextmod.a XTrap/libxtrap.a randr/librandr.a render/librender.a record/librecord.a $(LINKDIR) -lXfont -lXinerama -lX11 -lXdmcp -lz -lm + $(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o Xfbdev dix/libdix.a os/libos.a hw/kdrive/fbdev/libfbdev.a miext/layer/liblayer.a hw/kdrive/libkdrive.a hw/kdrive/linux/liblinux.a miext/shadow/libshadow.a fb/libfb.a mi/libmi.a Xext/libext.a Xext/extmod/libextmod.a XTrap/libxtrap.a randr/librandr.a render/librender.a record/librecord.a $(LINKDIR) -lXfont -lXinerama -lX11 -lXdmcp -lz -lm xinit: cd init; make - $(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o xinit init/xinit.o -lX11 + $(CC) $(CFLAGs) $(DEFS) $(LDFLAGS) -o xinit init/xinit.o $(LINKDIR) -lX11 -lpthread clean: cd render; make clean From 0ec6f21409deb2b8529d35a2e1d322a6e33a1521 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 22 Oct 2015 01:10:12 +0300 Subject: [PATCH 6/8] do not prepend DISTDIR to paths from standard_definitions.mk --- standard_definitions.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/standard_definitions.mk b/standard_definitions.mk index da5c60c..a78d9d5 100644 --- a/standard_definitions.mk +++ b/standard_definitions.mk @@ -109,7 +109,7 @@ LINKDIR=-L/usr/xsrc/pkg/usr/lib #INCDIR=/opt/musl/include PREDIR=/usr -LIBDIR=$(DESTDIR)$(PREDIR)/lib -INCDIR=$(DESTIR)$(PREDIR)/include -BINDIR=$(DESTDIR)$(PREDIR)/bin -DOCDIR=$(DESTDIR)$(PREDIR)/doc +LIBDIR=$(PREDIR)/lib +INCDIR=$(PREDIR)/include +BINDIR=$(PREDIR)/bin +DOCDIR=$(PREDIR)/doc From f6a43b6dbe786f920cb527062318a612ee34b246 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 22 Oct 2015 01:16:37 +0300 Subject: [PATCH 7/8] set MANDIR from standard_definitions.mk --- standard_definitions.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/standard_definitions.mk b/standard_definitions.mk index a78d9d5..07f8036 100644 --- a/standard_definitions.mk +++ b/standard_definitions.mk @@ -113,3 +113,4 @@ LIBDIR=$(PREDIR)/lib INCDIR=$(PREDIR)/include BINDIR=$(PREDIR)/bin DOCDIR=$(PREDIR)/doc +MANDIR=$(PREDIR)/man From b8d44cf64baf2f300480eddeefebb012840a69ea Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 22 Oct 2015 01:17:30 +0300 Subject: [PATCH 8/8] force X symlink creation --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1455502..b73f0f2 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ clean: install: install -D -m 755 Xfbdev $(DESTDIR)/$(BINDIR)/Xfbdev install -m 755 xinit $(DESTDIR)/$(BINDIR)/xinit - ln -s $(BINDIR)/Xfbdev $(DESTDIR)/$(BINDIR)/X + ln -fs $(BINDIR)/Xfbdev $(DESTDIR)/$(BINDIR)/X install -D -m 644 init/xinit.1 $(DESTDIR)/$(MANDIR)/man1/xinit.1 install -D -m 644 README $(DESTDIR)/$(DOCDIR)/tinyxserver/README install -m 644 changelog $(DESTDIR)/$(DOCDIR)/tinyxserver/changelog