diff options
| author | Luiz Otavio O Souza <loos@FreeBSD.org> | 2014-01-10 20:29:46 +0000 |
|---|---|---|
| committer | Luiz Otavio O Souza <loos@FreeBSD.org> | 2014-01-10 20:29:46 +0000 |
| commit | 67619a4120eb99647d806a73a9967370e10db67a (patch) | |
| tree | ac67a0d213c659d5a960fd08a7f1440835364ba8 /sys/modules/geom | |
| parent | b971a4c9ba2089cef9c4a03d5e4b0394802d3a49 (diff) | |
| download | src-67619a4120eb99647d806a73a9967370e10db67a.tar.gz src-67619a4120eb99647d806a73a9967370e10db67a.zip | |
Build the geom_uncompress(4) module by default.
Fix geom_uncompress(4) module loading. Don't link zlib.c (which is a module
itself) directly.
The built module was verified and used to read a few mkulzma(8) images on
amd64 to validate some of the informations on the manual page.
While here, don't overwrite CFLAGS.
Reviewed by: ray
Approved by: adrian (mentor)
Notes
Notes:
svn path=/head/; revision=260523
Diffstat (limited to 'sys/modules/geom')
| -rw-r--r-- | sys/modules/geom/Makefile | 1 | ||||
| -rw-r--r-- | sys/modules/geom/geom_uncompress/Makefile | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile index ca7d7e639558..74166400d740 100644 --- a/sys/modules/geom/Makefile +++ b/sys/modules/geom/Makefile @@ -24,6 +24,7 @@ SUBDIR= geom_bde \ geom_shsec \ geom_stripe \ geom_sunlabel \ + geom_uncompress \ geom_uzip \ geom_vinum \ geom_virstor \ diff --git a/sys/modules/geom/geom_uncompress/Makefile b/sys/modules/geom/geom_uncompress/Makefile index 3bec55a8389d..ab0912e4e1c1 100644 --- a/sys/modules/geom/geom_uncompress/Makefile +++ b/sys/modules/geom/geom_uncompress/Makefile @@ -7,11 +7,11 @@ ${.CURDIR}/../../../net KMOD= geom_uncompress -CFLAGS= -I${.CURDIR}/../../../geom/uncompress/ \ +CFLAGS+= -I${.CURDIR}/../../../geom/uncompress/ \ -I${.CURDIR}/../../../contrib/xz-embedded/freebsd \ -I${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/ SRCS= g_uncompress.c xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \ - xz_malloc.c zlib.c + xz_malloc.c SRCS+= xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h zlib.h .include <bsd.kmod.mk> |