From 28294fe79824fffbf6fe559689e241da7a5295c0 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Mon, 13 Aug 2007 19:33:36 +0000 Subject: [PATCH] Remove ntp patch which fails to apply, add TODO for later fixing --- package/ntp/TODO | 33 +++++++++++++++++++++++++++++ package/ntp/ntp-cross-compile.patch | 11 ---------- 2 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 package/ntp/TODO delete mode 100644 package/ntp/ntp-cross-compile.patch diff --git a/package/ntp/TODO b/package/ntp/TODO new file mode 100644 index 0000000000..ba6d7fdf95 --- /dev/null +++ b/package/ntp/TODO @@ -0,0 +1,33 @@ +The obsolete patch tries to clear "BUILT_SOURCE" + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +*************** +*** 157,163 **** + bin_PROGRAMS = ntpdc + EXTRA_PROGRAMS = ntpdc-layout + EXTRA_DATA = check-layout +- BUILT_SOURCES = maybe-layout + INCLUDES = -I$(top_srcdir)/include + # LDADD might need RESLIB and ADJLIB + ntpdc_LDADD = version.o ../libntp/libntp.a @READLINE_LIBS@ +--- 157,163 ---- + bin_PROGRAMS = ntpdc + EXTRA_PROGRAMS = ntpdc-layout + EXTRA_DATA = check-layout ++ BUILT_SOURCES = + INCLUDES = -I$(top_srcdir)/include + # LDADD might need RESLIB and ADJLIB + ntpdc_LDADD = version.o ../libntp/libntp.a @READLINE_LIBS@ +------------------------------------------------------------ +The current tarball contains a lot more: + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +AUTOMAKE_OPTIONS = ../util/ansi2knr +EXTRA_DATA = check-layout +BUILT_SOURCES = @MAKE_CHECK_LAYOUT@ ntpdc-opts.c ntpdc-opts.h ntpdc.1 \ + ntpdc-opts.texi ntpdc-opts.menu +AM_CPPFLAGS = -I$(top_srcdir)/include $(LIBOPTS_CFLAGS) +# LDADD might need RESLIB and ADJLIB +------------------------------------------------------------ + +Do we need to remove "@MAKE_CHECK_LAYOUT@" in a new patch? diff --git a/package/ntp/ntp-cross-compile.patch b/package/ntp/ntp-cross-compile.patch deleted file mode 100644 index ef4f11ae55..0000000000 --- a/package/ntp/ntp-cross-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ntp/ntpdc/Makefile.in -+++ ntp/ntpdc/Makefile.in -@@ -157,7 +157,7 @@ - bin_PROGRAMS = ntpdc - EXTRA_PROGRAMS = ntpdc-layout - EXTRA_DATA = check-layout --BUILT_SOURCES = maybe-layout -+BUILT_SOURCES = - INCLUDES = -I$(top_srcdir)/include - # LDADD might need RESLIB and ADJLIB - ntpdc_LDADD = version.o ../libntp/libntp.a @READLINE_LIBS@ -- 2.30.2