Attachment #333448 for bug #178718




 building of static binaries.
++ b/configure.in

AC_SUBST(BSDLIB_CMT)
AC_SUBST_FILE(MAKEFILE_BSDLIB)
dnl
dnl handle --enable-static-progs
dnl
AC_ARG_ENABLE([static-progs],
[  --enable-static-progs	  build static binaries],
if test "$enableval" = "no"
then
	STATICBIN_CMT=#
	AC_MSG_RESULT([Disabling static binaries])
else
	STATICBIN_CMT=
	AC_MSG_RESULT([Building static binaries])
fi
,
STATICBIN_CMT=#
AC_MSG_RESULT([Disabling static binaries by default])
)
AC_SUBST(STATICBIN_CMT)
dnl
dnl handle --enable-profile
dnl
AC_ARG_ENABLE([profile],
++ b/e2fsck/Makefile.in

@MCONFIG@

PROGS=		e2fsck
@STATICBIN_CMT@PROGS+= e2fsck.static
MANPAGES=	e2fsck.8
FMANPAGES=	e2fsck.conf.5

++ b/misc/Makefile.in


SPROGS=		mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
			$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
@STATICBIN_CMT@SPROGS+= tune2fs.static mke2fs.static @BLKID_CMT@$(BLKID_PROG).static

USPROGS=	mklost+found filefrag e2freefrag $(UUIDD_PROG) $(E4DEFRAG_PROG)
SMANPAGES=	tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
			e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \

tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
	$(E) "	LD $@"
	$(Q) $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
		$(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
		$(STATIC_LIBQUOTA) $(STATIC_LIBE2P) $(LIBINTL) $(STATIC_LIBS)

tune2fs.profiled: $(PROFILED_TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
		$(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) \


blkid.static: $(BLKID_OBJS) $(STATIC_DEPLIBS) $(DEPSTATIC_LIBBLKID)
	$(E) "	LD $@"
	$(Q) $(CC) $(LDFLAGS_STATIC) -o blkid.static $(BLKID_OBJS) $(STATIC_LIBS) \
		$(STATIC_LIBBLKID) $(LIBINTL)

blkid.profiled: $(PROFILED_BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \

mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) \
		$(DEPSTATIC_LIBQUOTA) $(DEPSTATIC_LIBBLKID)
	$(E) "	LD $@"
	$(Q) $(CC) $(LDFLAGS_STATIC) -o mke2fs.static $(MKE2FS_OBJS) \
		$(STATIC_LIBQUOTA) $(STATIC_LIBS) $(STATIC_LIBE2P) \
		$(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(LIBINTL)

++ b/resize/Makefile.in

@MCONFIG@

PROGS=		resize2fs
@STATICBIN_CMT@PROGS+= resize2fs.static
TEST_PROGS=	test_extent
MANPAGES=	resize2fs.8



resize2fs.static: $(RESIZE_OBJS) $(DEPSTATIC_LIBS)
	$(E) "	LD $@"
	$(Q) $(LD) $(LDFLAGS_STATIC) -o resize2fs.static \
		$(RESIZE_OBJS) $(STATIC_LIBS) 

resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in
++ b/configure

LIB_EXT
CHECKER_CMT
PROFILE_CMT
STATICBIN_CMT
BSDLIB_CMT
ELF_CMT
HTREE_CMT

enable_htree
enable_elf_shlibs
enable_bsd_shlibs
enable_static_progs
enable_profile
enable_checker
enable_jbd_debug

  --enable-htree      	  enable EXPERIMENTAL htree directory support
  --enable-elf-shlibs	  select ELF shared libraries
  --enable-bsd-shlibs	  select BSD shared libraries
  --enable-static-progs	  build static binaries
  --enable-profile	  build profiling libraries
  --enable-checker	  build checker libraries
  --enable-jbd-debug  	  enable journal debugging




# Check whether --enable-static-progs was given.
if test "${enable_static_progs+set}" = set; then :
  enableval=$enable_static_progs; if test "$enableval" = "no"
then
	STATICBIN_CMT=#
	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling static binaries" >&5
$as_echo "Disabling static binaries" >&6; }
else
	STATICBIN_CMT=
	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building static binaries" >&5
$as_echo "Building static binaries" >&6; }
fi

else
  STATICBIN_CMT=#
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling static binaries by default" >&5
$as_echo "Disabling static binaries by default" >&6; }

fi


# Check whether --enable-profile was given.
if test "${enable_profile+set}" = set; then :
  enableval=$enable_profile; if test "$enableval" = "no"

Return to bug 178718

Line Link Here

(-)file_not_specified_in_diff (-10 / +56 lines)
	building of static binaries.		building of static binaries.
1	-- a/configure.in	1	++ b/configure.in
Lines 351-356 AC_MSG_RESULT([Disabling BSD shared libraries by default]) Link Here
351	AC_SUBST(BSDLIB_CMT)	351	AC_SUBST(BSDLIB_CMT)
352	AC_SUBST_FILE(MAKEFILE_BSDLIB)	352	AC_SUBST_FILE(MAKEFILE_BSDLIB)
353	dnl	353	dnl
		354	dnl handle --enable-static-progs
		355	dnl
		356	AC_ARG_ENABLE([static-progs],
		357	[ --enable-static-progs build static binaries],
		358	if test "$enableval" = "no"
		359	then
		360	STATICBIN_CMT=#
		361	AC_MSG_RESULT([Disabling static binaries])
		362	else
		363	STATICBIN_CMT=
		364	AC_MSG_RESULT([Building static binaries])
		365	fi
		366	,
		367	STATICBIN_CMT=#
		368	AC_MSG_RESULT([Disabling static binaries by default])
		369	)
		370	AC_SUBST(STATICBIN_CMT)
		371	dnl
354	dnl handle --enable-profile	372	dnl handle --enable-profile
355	dnl	373	dnl
356	AC_ARG_ENABLE([profile],	374	AC_ARG_ENABLE([profile],
357	-- a/e2fsck/Makefile.in	375	++ b/e2fsck/Makefile.in
Lines 12-17 INSTALL = @INSTALL@ Link Here
12	@MCONFIG@	12	@MCONFIG@
13		13
14	PROGS= e2fsck	14	PROGS= e2fsck
		15	@STATICBIN_CMT@PROGS+= e2fsck.static
15	MANPAGES= e2fsck.8	16	MANPAGES= e2fsck.8
16	FMANPAGES= e2fsck.conf.5	17	FMANPAGES= e2fsck.conf.5
17		18
18	-- a/misc/Makefile.in	19	++ b/misc/Makefile.in
Lines 28-33 INSTALL = @INSTALL@ Link Here
28		28
29	SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \	29	SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \
30	$(E2IMAGE_PROG) @FSCK_PROG@ e2undo	30	$(E2IMAGE_PROG) @FSCK_PROG@ e2undo
		31	@STATICBIN_CMT@SPROGS+= tune2fs.static mke2fs.static @BLKID_CMT@$(BLKID_PROG).static
		32
31	USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) $(E4DEFRAG_PROG)	33	USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) $(E4DEFRAG_PROG)
32	SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \	34	SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \
33	e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \	35	e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \
Lines 161-168 tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \ Link Here
161	tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)	163	tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
162	$(E) " LD $@"	164	$(E) " LD $@"
163	$(Q) $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \	165	$(Q) $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
164	$(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \	166	$(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
165	$(STATIC_LIBQUOTA) $(STATIC_LIBE2P) $(LIBINTL)	167	$(STATIC_LIBQUOTA) $(STATIC_LIBE2P) $(LIBINTL) $(STATIC_LIBS)
166		168
167	tune2fs.profiled: $(PROFILED_TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \	169	tune2fs.profiled: $(PROFILED_TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
168	$(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) \	170	$(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) \
Lines 180-186 blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS) Link Here
180		182
181	blkid.static: $(BLKID_OBJS) $(STATIC_DEPLIBS) $(DEPSTATIC_LIBBLKID)	183	blkid.static: $(BLKID_OBJS) $(STATIC_DEPLIBS) $(DEPSTATIC_LIBBLKID)
182	$(E) " LD $@"	184	$(E) " LD $@"
183	$(Q) $(CC) $(ALL_LDFLAGS) -o blkid.static $(BLKID_OBJS) $(STATIC_LIBS) \	185	$(Q) $(CC) $(LDFLAGS_STATIC) -o blkid.static $(BLKID_OBJS) $(STATIC_LIBS) \
184	$(STATIC_LIBBLKID) $(LIBINTL)	186	$(STATIC_LIBBLKID) $(LIBINTL)
185		187
186	blkid.profiled: $(PROFILED_BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \	188	blkid.profiled: $(PROFILED_BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \
Lines 238-244 mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBBLKID) $(DEPLIBUUID) \ Link Here
238	mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) \	240	mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) \
239	$(DEPSTATIC_LIBQUOTA) $(DEPSTATIC_LIBBLKID)	241	$(DEPSTATIC_LIBQUOTA) $(DEPSTATIC_LIBBLKID)
240	$(E) " LD $@"	242	$(E) " LD $@"
241	$(Q) $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \	243	$(Q) $(CC) $(LDFLAGS_STATIC) -o mke2fs.static $(MKE2FS_OBJS) \
242	$(STATIC_LIBQUOTA) $(STATIC_LIBS) $(STATIC_LIBE2P) \	244	$(STATIC_LIBQUOTA) $(STATIC_LIBS) $(STATIC_LIBE2P) \
243	$(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(LIBINTL)	245	$(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(LIBINTL)
244		246
245	-- a/resize/Makefile.in	247	++ b/resize/Makefile.in
Lines 13-18 LDFLAG_STATIC = @LDFLAG_STATIC@ Link Here
13	@MCONFIG@	13	@MCONFIG@
14		14
15	PROGS= resize2fs	15	PROGS= resize2fs
		16	@STATICBIN_CMT@PROGS+= resize2fs.static
16	TEST_PROGS= test_extent	17	TEST_PROGS= test_extent
17	MANPAGES= resize2fs.8	18	MANPAGES= resize2fs.8
18		19
Lines 45-51 resize2fs: $(RESIZE_OBJS) $(DEPLIBS) Link Here
45		46
46	resize2fs.static: $(RESIZE_OBJS) $(DEPSTATIC_LIBS)	47	resize2fs.static: $(RESIZE_OBJS) $(DEPSTATIC_LIBS)
47	$(E) " LD $@"	48	$(E) " LD $@"
48	$(Q) $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \	49	$(Q) $(LD) $(LDFLAGS_STATIC) -o resize2fs.static \
49	$(RESIZE_OBJS) $(STATIC_LIBS)	50	$(RESIZE_OBJS) $(STATIC_LIBS)
50		51
51	resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in	52	resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in
52	-- a/configure	53	++ b/configure
Lines 737-742 STATIC_LIB_EXT Link Here
737	LIB_EXT	737	LIB_EXT
738	CHECKER_CMT	738	CHECKER_CMT
739	PROFILE_CMT	739	PROFILE_CMT
		740	STATICBIN_CMT
740	BSDLIB_CMT	741	BSDLIB_CMT
741	ELF_CMT	742	ELF_CMT
742	HTREE_CMT	743	HTREE_CMT
Lines 833-838 enable_compression Link Here
833	enable_htree	834	enable_htree
834	enable_elf_shlibs	835	enable_elf_shlibs
835	enable_bsd_shlibs	836	enable_bsd_shlibs
		837	enable_static_progs
836	enable_profile	838	enable_profile
837	enable_checker	839	enable_checker
838	enable_jbd_debug	840	enable_jbd_debug
Lines 1488-1493 Optional Features: Link Here
1488	--enable-htree enable EXPERIMENTAL htree directory support	1490	--enable-htree enable EXPERIMENTAL htree directory support
1489	--enable-elf-shlibs select ELF shared libraries	1491	--enable-elf-shlibs select ELF shared libraries
1490	--enable-bsd-shlibs select BSD shared libraries	1492	--enable-bsd-shlibs select BSD shared libraries
		1493	--enable-static-progs build static binaries
1491	--enable-profile build profiling libraries	1494	--enable-profile build profiling libraries
1492	--enable-checker build checker libraries	1495	--enable-checker build checker libraries
1493	--enable-jbd-debug enable journal debugging	1496	--enable-jbd-debug enable journal debugging
Lines 4641-4646 fi Link Here
4641		4644
4642		4645
4643		4646
		4647	# Check whether --enable-static-progs was given.
		4648	if test "${enable_static_progs+set}" = set; then :
		4649	enableval=$enable_static_progs; if test "$enableval" = "no"
		4650	then
		4651	STATICBIN_CMT=#
		4652	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling static binaries" >&5
		4653	$as_echo "Disabling static binaries" >&6; }
		4654	else
		4655	STATICBIN_CMT=
		4656	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Building static binaries" >&5
		4657	$as_echo "Building static binaries" >&6; }
		4658	fi
		4659
		4660	else
		4661	STATICBIN_CMT=#
		4662	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling static binaries by default" >&5
		4663	$as_echo "Disabling static binaries by default" >&6; }
		4664
		4665	fi
		4666
		4667
4644	# Check whether --enable-profile was given.	4668	# Check whether --enable-profile was given.
4645	if test "${enable_profile+set}" = set; then :	4669	if test "${enable_profile+set}" = set; then :
4646	enableval=$enable_profile; if test "$enableval" = "no"	4670	enableval=$enable_profile; if test "$enableval" = "no"