aboutsummaryrefslogtreecommitdiff
path: root/lib/libmagic/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* packages: Install development manpages in the -dev packageLexi Winter2025-10-261-3/+5
| | | | | | | | | | | | | | | | | | | | | Add a new per-group SUBPACKAGE option to bsd.man.mk. When MANSPLITPKG is enabled, this is forced to "-man", otherwise it defaults to empty but can be overridden by the caller. Use this in bsd.lib.mk to install library manpages in the -dev package instead of the base package. This is nearly always preferable, since library manpages are usually in section 2 or 3 and are only relevant to people with development packages installed. For manpages which should be installed in the base package even for libraries, add a new MANNODEV group in bsd.lib.mk. Update existing Makefiles to use this where appropriate. MFC after: 3 days Discussed with: olce Reviewed by: olce Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52832
* libmagic: Use HOST_CC when compiling hostprog used by buildStephen J. Kiernan2024-03-271-2/+3
| | | | | | | | | | The "mkmagic" program should be built with the host compiler. Only use BTOOLSPATH if not building for host Obtained from: Juniper Networks, Inc. Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D44539
* MFV: file 5.45.Xin LI2023-09-101-0/+1
| | | | MFC after: 3 days
* Remove $FreeBSD$: one-line sh patternWarner Losh2023-08-161-1/+0
| | | | Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/
* Install working pkgconfig .pc files for compat librariesAlex Richardson2022-08-111-3/+3
| | | | | | | | | The default ones are install them to /usr/libdata/pkgconfig, and we can't use this path for compat libraries, so we use /usr/lib<suffix>/pkgconfigi here. Test Plan: grep -rn libdir= ./usr/lib32/pkgconfig/*.pc MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D34939
* Convert libs with pc files to use PCFILESEmmanuel Vadot2021-03-161-2/+1
| | | | | | | | Now the .pc ends up in the correct package (-dev) Reviewed by: bapt, emaste Differential Revision: https://reviews.freebsd.org/D29172 MFC after: 2 weeks
* Fix installation of magic file.Xin LI2020-06-171-2/+2
| | | | | | | | | Reported by: lwhsu MFC after: 2 weeks X-MFC-with: r362258 Notes: svn path=/head/; revision=362279
* MFV r362254: file 5.39.Xin LI2020-06-171-0/+17
| | | | | | | MFC after: 2 weeks Notes: svn path=/head/; revision=362258
* MFV r357712: file 5.38.Xin LI2020-02-111-0/+1
| | | | | | | MFC after: 2 weeks Notes: svn path=/head/; revision=357757
* Tweaks for DIRDEPS_BUILDSimon J. Gerraty2019-12-191-1/+3
| | | | | | | | | | | | | | libmagic only depend on mkmagic if not DIRDEPS_BUILD libpmc fix -I for libpmcstat local.dirdeps.mk be even more careful about adding gnu/lib/csu to DIRDEPS Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D22872 Notes: svn path=/head/; revision=355904
* Update dirdeps.mk and gendirdeps.mkSimon J. Gerraty2019-12-111-0/+6
| | | | | | | | | | | | | | | | | | | The env space consumed by exporting all libc's .meta files left little room for command line, so unexport when done. Update dirdeps.mk to latest and add dirdeps-targets.mk to simplify/update targets/Makefile Makefile changes to go with Makefile.depend changes in D22494 Reviewed by: bdrewery MFC after: 1 week Sponsored by: Juniper Networks Differential Revision: https://reviews.freebsd.org/D22495 Notes: svn path=/head/; revision=355618
* MFV r354582: file 5.37.Xin LI2019-11-101-1/+1
| | | | | | | MFC after: 3 days Notes: svn path=/head/; revision=354595
* Fix .depend files to work for build tools.Bryan Drewery2019-06-151-2/+3
| | | | | | | | | | This is somewhat of a follow-up to r335746. MFC after: 2 weeks Sponsored by: DellEMC Notes: svn path=/head/; revision=349062
* Don't use CCACHE for linking.Bryan Drewery2018-06-271-1/+1
| | | | | | | | MFC after: 2 weeks Sponsored by: Dell EMC Notes: svn path=/head/; revision=335733
* Style fixup:Cy Schubert2018-05-201-2/+2
| | | | | | | | A non-functional commit to make adjustment to an aesthetically unpleasing long line. Notes: svn path=/head/; revision=333923
* Fix build post r333919.Cy Schubert2018-05-201-2/+2
| | | | | | | | This commit results in an aesthetically unpleasing long line which will be fixed next commit. Notes: svn path=/head/; revision=333922
* LIB32: Avoid linking in unneeded (and invalid lib32) libz for libmagic build ↵Bryan Drewery2018-03-091-0/+2
| | | | | | | | | | | | | | | | | | | | tool. Usually this is just ignored: /usr/bin/ld: skipping incompatible /scratch/obj/root/git/freebsd/amd64.amd64/obj-lib32/lib/libz/libz.so when searching for -lz /usr/bin/ld: skipping incompatible /scratch/obj/root/git/freebsd/amd64.amd64/obj-lib32/lib/libz/libz.a when searching for -lz However some combination of newer toolchains simply fail here instead: /usr/bin/ld: error: /home/dstolfa/obj/home/dstolfa/cadets/amd64.amd64/obj-lib32/lib/libz/libz.so is incompatible with /usr/lib/crt1.o Libz is not needed for mkmagic so just exclude it. Reported by: Domagoj Stolfa <domagoj.stolfa@gmail.com> MFC after: 2 weeks Sponsored by: Dell EMC Notes: svn path=/head/; revision=330702
* Use SRCTOP-relative paths to other directories instead of .CURDIR-relative onesEnji Cooper2017-01-201-1/+1
| | | | | | | | | | This simplifies pathing in make/displayed output MFC after: 3 weeks Sponsored by: Dell EMC Isilon Notes: svn path=/head/; revision=312497
* Fix build: explicitly reference the generated magic.h as dependencyXin LI2016-06-271-3/+3
| | | | | | | | | | | | | of mkmagic and point its location. Reported by: jenkins Pointy hat to: delphij MFC after: 2 weeks X-MFC-With: 302221 Approved by: re (kib) Notes: svn path=/head/; revision=302222
* MFV r302218: file 5.28.Xin LI2016-06-271-0/+6
| | | | | | | | | Relnotes: yes MFC after: 2 weeks Approved by: re (gjb) Notes: svn path=/head/; revision=302221
* DIRDEPS_BUILD: Run the staged bootstrap-tools version of build-tools.Bryan Drewery2016-05-091-1/+1
| | | | | | | | | This avoids running target binaries. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=299289
* MFV r298178:Xin LI2016-04-181-1/+1
| | | | | | | | | | Update file to 5.26. MFC after: 2 weeks Relnotes: yes Notes: svn path=/head/; revision=298192
* MFHGlen Barber2016-04-161-1/+1
|\ | | | | | | | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=298092
| * META_MODE: Don't rebuild build-tools targets during normal build.Bryan Drewery2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This avoids 'build command changed' due to CFLAGS/CC changes during the normal build. Without this the build-tools targets end up rebuilding for the *target* rather than keeping the native versions built in build-tools. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=297997
* | First pass through library packaging.Glen Barber2016-02-041-0/+1
|/ | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=295278
* Convert libraries to use LIBADDBaptiste Daroussin2014-11-251-2/+1
| | | | | | | While here reduce a bit overlinking Notes: svn path=/head/; revision=275024
* MFV r267843: update file/libmagic to 5.19.Xin LI2014-06-261-6/+7
| | | | | | | MFC after: 2 weeks Notes: svn path=/head/; revision=267897
* Sort .ALLSRC before concatenating files together. This makes sure that theXin LI2014-05-061-1/+1
| | | | | | | | | | | | | file are always built the same. (Note that Header and Localstuff must appear first and in that order, the sorting does not affect as a coincident effect). Submitted by: sjg MFC after: 3 days Notes: svn path=/head/; revision=265464
* r235638 is not the clean way to add support for building on ancient FreeBSDDavid E. O'Brien2012-09-111-3/+3
| | | | | | | | | | | versions. Instead use Imp's good work on "legacy" and follow the outcome of the previous TRB discussions on this topic. Now use the libc getline() if it exists, and only where it doesn't create a bootstraping version. Notes: svn path=/head/; revision=240377
* Correct a regression introduced during the import of file(1) 5.11.Stephen McKay2012-08-171-1/+1
| | | | | | | | | | | | | | Magic tests containing "search" or "regex" directives were incorrectly compiled by "mkmagic" and were effectively ignored. This caused troff files (for example) to be detected as simply "ASCII text" instead of as "troff or preprocessor input, ASCII text". PR: bin/170415 Approved by: consensus on developers@ MFC after: 3 days Notes: svn path=/head/; revision=239348
* Don't depend on getline being on the build machine. That'sMarcel Moolenaar2012-05-191-2/+3
| | | | | | | not the case for FreeBSD 7.x machines. Notes: svn path=/head/; revision=235638
* Update file(1) to version 5.11.David E. O'Brien2012-04-191-1/+1
| | | | Notes: svn path=/head/; revision=234449
* Use CFLAGS and LDFLAGS when compiling mkmagic. This ensures that all theRui Paulo2010-08-011-2/+1
| | | | | | | | | | correct flags are being used (esp. NO_WERROR wrt clang). Submitted by: Dimitry Andric <dimitry at andric.com> Reviewed by: ru Notes: svn path=/head/; revision=210730
* With r208341 in place WARNS can be increased.Marius Strobl2010-05-201-1/+1
| | | | Notes: svn path=/head/; revision=208342
* Build lib/ with WARNS=6 by default.Ed Schouten2010-01-021-0/+2
| | | | | | | | | | | | Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and lower it when needed. I'm setting WARNS?=0 for secure/. It seems secure/ includes the Makefile.inc provided by lib/. I'm not going to touch that directory. Most of the code there is contributed anyway. Notes: svn path=/head/; revision=201381
* Bump the version of all non-symbol-versioned shared libraries inKen Smith2009-07-191-1/+1
| | | | | | | | | | | preparation for 8.0-RELEASE. Add the previous version of those libraries to ObsoleteFiles.inc and bump __FreeBSD_Version. Reviewed by: kib Approved by: re (rwatson) Notes: svn path=/head/; revision=195767
* Merge vendor/file/dist@191739, bringing FILE 5.00 to 8-CURRENT.David E. O'Brien2009-05-041-2/+3
| | | | Notes: svn path=/head/; revision=191771
* Don't make the MIME magic any longer.David E. O'Brien2009-01-021-5/+2
| | | | Notes: svn path=/head/; revision=186693
* Bump library versions in preparation for 7.0.Daniel Eischen2007-05-211-1/+1
| | | | | | | Ok'd by: kan Notes: svn path=/head/; revision=169807
* Update for the 'file' 4.17 import.David E. O'Brien2006-06-191-1/+1
| | | | Notes: svn path=/head/; revision=159769
* Add missing shared library interdependencies.Ruslan Ermilov2005-11-101-0/+2
| | | | Notes: svn path=/head/; revision=152285
* Bump the shared library version number of all libraries that have notKen Smith2005-07-221-1/+1
| | | | | | | | | | been bumped since RELENG_5. Reviewed by: ru Approved by: re (not needed for commit check but in principle...) Notes: svn path=/head/; revision=148297
* Clean up makefile.Ruslan Ermilov2005-01-281-7/+2
| | | | | | | | | | | - Remove all:. It's redundant, and ${LIB} in it is just a bug. - Remove .ORDER:. *.mgc files can safely be built in parallel. - Remove PITA. The mkmagic tool is smart to put the binary file into the current directory (${.OBJDIR}) even if the source file lives somewhere else, which is just what we need. Notes: svn path=/head/; revision=140944
* Install the header for libmagic.David E. O'Brien2004-11-191-0/+1
| | | | | | | | PR: 73647 Submitted by: Uranus <uranus@it.muds.net> Notes: svn path=/head/; revision=137887
* uniq(1) is not an install tool, and using it was causingRuslan Ermilov2004-10-181-2/+2
| | | | | | | | | "uniq: not found" during the installworld. Spotted by: Roman Neuhauser Notes: svn path=/head/; revision=136681
* Don't try to programatically support running file(1) w/in /usr/obj or otherDavid E. O'Brien2004-08-091-1/+1
| | | | | | | | | non-standard install path. Agreed with: ru Notes: svn path=/head/; revision=133370
* Uncomment the real paths and remove the local debugging paths.David E. O'Brien2004-08-091-2/+1
| | | | | | | Noticed by: ru (who's faster than 'make world' on my stock src test machine) Notes: svn path=/head/; revision=133365
* Bmake the library containing and processing the magic.David E. O'Brien2004-08-091-0/+59
Notes: svn path=/head/; revision=133362