1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00
Commit Graph

84 Commits

Author SHA1 Message Date
Alexander Leidinger
23b3bc4b0d Mega-patch to cleanup the ports infrastructure regarding our linux bits:
- USE_LINUX now implies NO_FILTER_SHLIBS=yes. It also doesn't use FreeBSD
    tools to strip binaries anymore, so it's not neccesary anymore to override
    STRIP and STRIP_CMD.
  - USE_LINUX_PREFIX implies NO_MTREE now.
  - In the USE_LINUX case, USE_XLIB now depends upon the linux X11 libraries
    instead upon the native FreeBSD libraries.
  - The variable LINUX_BASE_PORT contains a string which is suitable as an
    item in *_DEPENDS, so if a port BATCH_DEPENDS or FETCH_DEPENDS upon the
    default (or overriden) linux base, ${LINUX_BASE_PORT} should be used
    instead of a hardcoded reference.
  - Change all ports to comply to the "new world order".
  - The Ports Collection now allows to override the default linux_base port.
    Specify e.g. OVERRIDE_LINUX_BASE_PORT=rh-9 in /etc/make.conf to use
    ${PORTSDIR}/emulators/linux_base-rh-9 (the logic is to use
    ${PORTSDIR}/emulators/linux_base-${OVERRIDE_LINUX_BASE_PORT}).
  - If USE_LINUX or OVERRIDE_LINUX_BASE doesn't point to an existing linux_base
    port and if USE_LINUX isn't set to "yes" (case insensitive), the port will
    be marked as IGNORE. [1]
  - Readd USE_LINUX knobs into several ports and make several uses of a
    conditional dependency ("USE_LINUX?=") into an unconditional one
    ("USE_LINUX=") which where removed/changed by Trevor to allow the use of
    alternative linux_base ports. While this is a nice goal, the implementation
    resulted in missing dependencies. The OVERRIDE_LINUX_BASE_PORT knob
    in this commit is supposed to fix the problem while keeping the feature.
    Basicaly this includes a backout of Trevor's commit, to prevent confusion
    I mention it here explicitely.
  - Use the correct prefix (X11- instead of LOCAL- or LINUX-) for some ports.
    Chase dependencies for this.
  - Changes to make linux_devtools installable on amd64, remove some stray
    device nodes (they don't work on recent OS versions and aren't really
    needed).
  - Make linux_base-8 PREFIX clean and remove some stray device nodes.
    Additionally tell a little bit more about how to setup NIS/YP [2].
  - Update the PGSQL dependency in the linux-opengroupware port to a recent
    version (the old one isn't available anymore), I don't know if this
    works (at least it isn't more broken than before).
  - Use PREFIX/usr/share/doc instead of PREFIX/usr/doc in the divx4linux
    ports, the former path exists already and gets populated by other
    packages too (PREFIX=LINUXPREFIX!).
  - Fix some obvious (non-linuxolator) bugs in some linux ports while being
    there.
  - Bump PORTREVISION where neccesary.

Requested by:	portmgr (linimon) [1]
Submittted by:	Gerrit Kuehn <gerrit_huehn@gruft.fido.de [2]
Approved by:	portmgr (kris, linimon), maintainers (or maintainer timeout)
Tested on:	ports cluster (kris)
Reviewed by:	silence on emulation@
Superseedes PR:	69997

Maintainer approval from:
	chris@chrisburkert.de
	cracauer@cons.org
	des
	girgen
	jamie@bishopston.net
	mezz
	mi
	nivit@users.sf.net
        pat
	simond@irrelevant.org
	riggs@rrr.de
	Udo.Schweigert@Siemens.com
2005-06-17 22:59:29 +00:00
Alexander Leidinger
9dda9e7ad5 Update to 8.1.032. 2005-06-04 16:25:50 +00:00
Alexander Leidinger
9065223e4f Update to 8.1.030. 2005-04-30 10:42:42 +00:00
Alexander Leidinger
80b69054db - update to 8.1.028
- 5.x got the header fix too, don't install replacement headers there [1]
 - allow to override GXX_ROOT [2]

Note: you may see "as: Illegal seek" while compiling with icc (a simple test
didn't revealed the same message with icpc). I don't know the reason for it,
but the resulting executable seems to work, so I commit the update.

Thanks to:	marius [1]
Requested by:	mi [2]
2005-03-06 15:08:26 +00:00
Trevor Johnson
e66743b7d5 Respect the user's USE_LINUX setting. 2005-03-01 21:51:48 +00:00
Marius Strobl
db1ca4d8d2 Account for src/include/stdbool.h and src/sys/i386/include/_types.h have
been fixed in FreeBSD >= 600013 regarding using the GCC-compatibility.

Approved by:	netchild (blanket)
2005-02-19 13:51:40 +00:00
Alexander Leidinger
003de77308 The static linking case (C++ only) expects a crtbeginT.o. Based upon
inspection of src/contrib/gnu/crtstuff.c it seems it's the same as
crtbegin.o, so make a symlink for it. At least linking a "Hello World"
program with -static produces a working executable now.

Noticed by:	Niklas Sorensson <nik@cs.chalmers.se>
2005-02-18 21:21:49 +00:00
Alexander Leidinger
1e5a8ac3e3 Fix a system (all supported OS versions) header (stdbool.h) for the use with
icc.

Hint by:	Ulrich Spoerlein <q@uni.de>
2005-02-13 10:20:59 +00:00
Alexander Leidinger
64cf27c85d Say hello to the linux mega patch, it consolidates our linux bits a
little bit and allows to proceed to a more recent linux_base from
a stable (read as: the major bugs should be ironed out or identified
and most linux ports build just fine) source.

It also allows to ship 4.11 with a working linuxolator (the EOLed
linux_base is marked forbidden because of a security hole).

This is a major update, please read UPDATING (and CHANGES if you
develop linux ports).

Changes:
 - change the default linux_base from v7 to v8
 - add a newer freetype to linux_base-8 for nicer fonts display [1]
 - don't let cpio use hardlinks in the linux_base-8 port to quiet some
   warnings in some cases [2]
 - fix a cut&past error in the linux_base-8 pkg-install script [3]
 - convert the binary knob "USE_LINUX" to a version specifier, e.g.
   USE_LINUX=<value> specifies a dependency upon
   emulators/linux_base-<value>, exceptions are a value of "7" (which
   does what you want and adds a dependency to linux_base) and any
   value without a corresponding port in
   PORTSDIR/emulators/linux_base-<value> (which adds a dependency to
   the default linux_base)
 - don't implicitly add USE_LINUX with the USE_LINUX_PREFIX knob,
   this allows us to use the USE_LINUX_PREFIX knob for linux_base and
   paves the way for splitting up future linux base ports into
   individual pieces
 - remove RESTRICTED from some GPL licensed ports, even when we only
   distribute binaries, we get them from official linux sites, so
   anyone can grab them there if he needs to
 - add a dependency upon the linux X11 bits where necessary (based upon
   guesswork)
 - don't use USE_X_PREFIX in some linux ports since it adds a dependency
   to the FreeBSD X11 libs, as a workaround use PREFIX?= (the clean
   solution would be to remove the implicit USE_XLIB from USE_X_PREFIX)
 - bump the portrevision of the linux ports ("better safe than sorry"
   algorithm)
 - pass maintainership of the important linux infrastructure to a
   mailinglist, hijack freebsd-emulation@ for this purpose (if somebody
   doesn't like this: tell us your bikeshed color at freebsd-emulation@,
   my color would be "linuxolator@" in case someone cares...)
 - add a pkg-install script for linux-fontconfig, but don't use it;
   everything should work without it (the FreeBSD fc-cache program should
   do all the work), but in case we need it we just need to decomment the
   pkg-install part in the Makefile
 - fix some dependencies
 - fix some bugs
 - add some static plists
 - unbreak the ports with dependecies to more than one linux_base

This also fixes some ports which are marked BROKEN because of dependencies
to v7 and v8 of linux_base at the same time.

Known bugs:
 - the linux-mesa and linux-devtools ports install libGL*.so symlinks
 - some "minor" plist bugs (e.g. ld.so.{conf,cache} are modified by
   the linux X11 port, so linx_Base-8 moans at deinstall time)

Future work (interested souls should coordinate with freebsd-emulation@):
 - add some kind of USE_LINUX_X11 knob to streamline the X11 dependencies,
   or modify the behavior of USE_XLIB in the USE_LINUX case
   AFAIK trevor has some patches.
 - make USE_XLIB and USE_X_PREFIX orthogonal to be able to get rid of
   the PREFIX?= workaround in some linux ports
   Should be discussed/coordinated on/with x11@.
 - move the RPM bits from x11-toolkits/linux-gtk/Makefile to PORTSDIR/Mk/
 - update to a more recent linux base

PR:			69997, 70539 (and maybe others)
Discussed with/on:	java@, x11@, trevor, portmgr
Tested by:		mezz, portmgr, pointyhat
RPM hunted down by:	Joseph Gelinas <scirocco@tasam.com> [1]
Requested by:		portmgr [2]
Submitted by:		kris [3]
Approved by:		portmgr
2004-12-31 18:24:10 +00:00
Alexander Leidinger
d7595131a1 Update to 8.1.026. 2004-12-12 17:12:26 +00:00
Marius Strobl
e74a020fb9 - Update to 8.1.024.
- Declare a PATCH_DEPENDS on emulators/linux_base-8 only if actually using
  RTPpatch to apply an Intel provided binary patch.
- Turn the GCC-compatibility of ICC on by default for FreeBSD >= 502108;
  except for one bug which is worked around by this port and will be fixed
  in src later FreeBSD gained support for using the GCC-compatibility along
  with the patch to compile the kernel with ICC (but the ICC 8.0 series
  wasn't configurable/hackable enough to actually use it on FreeBSD, which
  resulted into the aforementioned bug).
- On FreeBSD >= 502108 default to using libstdc++ from the base as STL
  instead of STLport unless "-cxxlib-icc" is passed to icpc (made possible
  by turning on the GCC-compatibility and the compatibility to GCC 3.3 and
  3.4 which was added to ICC 8.1). On FreeBSD < 502108 STLport i.e.
  devel/stlport-icc is and will continue to be the only STL available.
  Update the instructions displayed by the post-install target accordingly.
- Put the wrappers for glibc specific symbols and other GNU/Linux compat
  hacks into their own library "libiccfbsd" and teach the ld-wrapper to
  injected this lib instead of adding these things to the Intel libcxa and
  libcxaguard. Beginning with ICC 8.1 non of the Intel libs is "guaranteed"
  to be linked into resulting executable (this is actually a fix in ICC
  as libcxa and libcxaguard are C++ only). This fixes linking against libm
  with icc amongst other things [1].
- Clean the ld-wrapper up a bit. Stop trying to create a perfect world for
  the real ld(1) regarding superfluous linkage options, ICC natively passes
  far to many of them to the linker that we easily could remove them all.
- Change the ld-wrapper to allow for bootstrapping STLport in a bit
  different way that we used to do it, required to make devel/stlport-icc
  build correctly again.
- Use fmt(1) to print the infos displayed by the post-install target so
  the text is formated properly after the included variables are expanded [2].

Todo: - Rework the freaking thread library selection via the PTHREAD_LIBS
        environment variable by the ld-wrapper, this causes really annoying
        problems when compiling ports with ICC. Some functionality analogous
        to the GCC "-pthread" option (which is also known by ICC but is not
        documented and doesn't do the right thing for FreeBSD) would be great.
      - Make devel/stlport-icc build again with ICC 8.1 after devel/stlport
        has been updated to 4.6.2 (PR 73604). Patch for 4.5.3 already done.

Reported by:	Dan Nelson <dnelson@allantgroup.com> [1]
Courtesy of:	netchild [2]
Approved by:	netchild
2004-11-16 20:14:47 +00:00
Marius Strobl
9bb80ef3fe o Preliminary update to 8.1.022:
- For changes since the 8.0 series see the installed C++ReleaseNotes.htm
    but note that information given there doesn't necessarily apply to ICC
    on FreeBSD, e.g. -cxxlib-gcc isn't the default on FreeBSD yet and this
    port also doesn't install the Eclipse and CDT IDEs.
  - ICC now unfortunately requires emulators/linux_base-8.
  - Works fine for compiling C source.
  - A 6.0-current GENERIC kernel compiles and boots.
  - The devel/stlport-icc port currently can't link the exception handling
    testsuite with this ICC version (due to relying on a missbehaviour of
    the old ICC versions) and has to be changed in a way that doesn't break
    lang/icc7.
  - Support for using the GCC-compatibility of ICC on FreeBSD and using
    the GNU libstdc++ as the STL with ICC is in the works.

o Like with the system GCC, default to libpthread for the threads library
  on FreeBSD >= 502102.

Approved by:		netchild
In joint forces with:	netchild
2004-11-02 23:27:26 +00:00
Alexander Leidinger
b2a8b75742 Update to 8.0.066p070.1. 2004-07-24 11:16:50 +00:00
Alexander Leidinger
0d3573e3ac Update to 8.0.066p069.1. 2004-06-29 16:13:11 +00:00
Alexander Leidinger
d5b092ee1c Change the way we handle the version numbering to be more correct
to the way pkg_version handles it.

Submitted by:	eik
2004-06-03 11:19:01 +00:00
Alexander Leidinger
5c609528a6 Update to 8.0.066.p067.1. 2004-06-02 17:04:54 +00:00
Alexander Leidinger
453e18e24e icc 8.0.066 now adds "-m elf_i386" in some circumstances. Remove this part
of the command line in the ld wrapper.

Noticed by:	Morten Rodal <morten@rodal.no>
2004-05-07 11:54:55 +00:00
Alexander Leidinger
7d05a42e5f Update to 8.0.066. 2004-04-30 11:34:23 +00:00
Alexander Leidinger
d4ebb0784c Update to 8.0.058.p063.1. 2004-03-27 13:22:42 +00:00
Alexander Leidinger
9a2a31e863 Update to 8.0.058.p061.
This version fixes the stlport test cases (heap corruption due to
inlining and exception handling).
2004-03-17 14:00:02 +00:00
Alexander Leidinger
baa8612f1d - some base system headers know about icc now, don't override them
where appropriate [1]
- make portlint happy [1]
- sync icc7 and icc [1]
- add linux_base as a patch depends for icc v8

Submitted by:	Marius Strobl <marius@alchemy.franken.de> [1]
Requested by:	maintainer [1]
2004-03-13 10:33:18 +00:00
Alexander Leidinger
8ef8e337e0 Update to 8.0.058.p060. 2004-02-26 13:21:46 +00:00
Alexander Leidinger
6919cc4384 icc & icc7:
- correct the use of ECHO_CMD and ECHO (swap them) [1]

icc:
 - fix the DISTFILE handling, it's automatically available after
   bsd.port.post.mk, not after bsd.port.pre.mk, so set it explicitly
   to be able to use it in the check for the IGNORE message [1]

icc7:
 - don't extract the Intel debugger, it's not usable without a
   threads debugging lib
 - USE_SIZE

Noticed after:			reading the commit log/diff of the
				ifc port [1]
Submitted indirectly by:	maho, hrs [1]
2004-02-01 13:37:13 +00:00
Alexander Leidinger
e05c290c83 - update to 8.0.058.p059
- use SIZE
- remove variables for objcopy and brandelf, they're now available
  from bsd.port.mk
- use a more generic chmod command
2004-01-30 12:41:19 +00:00
Trevor Johnson
439b8a040c Use the CPIO macro defined in bsd.port.mk. 2004-01-22 12:18:43 +00:00
Alexander Leidinger
3b08f6904f - update to 8.0.058
- add intel-patch target to easy porting effort of future versions [1]
- remove intel debugger rpm, as long as we don't have a libthread_db
  we can't use it [2]

Note: The stlport-icc exception handling test will still fail with this
      version.

Suggested by (sort of):	Marius Strobl <marius@alchemy.franken.de> [1]
Noticed by:		Marius Strobl <marius@alchemy.franken.de> [2]
2004-01-19 14:13:32 +00:00
Alexander Leidinger
5b75a54ddf Update to 8.0.055.p057.
As Intel uses it's own directory for ifc and icc, we don't conflict with
ifc anymore.

Because of ABI changes, you have to recompile C++ programs (don't forget
stlport-icc).

Note that this port is a _work in progress_:
 - Icc allows to use an already installed libstdc++ from gcc, this doesn't
   work yet on FreeBSD. Libstdc++ on 4.x is too old, so it's unlikely we
   can add support for it. The headers of libstdc++ shipping with FreeBSD
   5.2-CURRENT use GCCisms not (yet) supported by icc, the hardcoded search
   path for them also doesn't fit for FreeBSD 5.2-CURRENT.
 - We've incorporated parts (cxa) of the FreeBSD >= 502101 libc on < 502101
   systems. It's tested on 4.x, but not on FreeBSD < 502101.
 - Not all (new) options (including GCC compatibility) are thoroughly
   tested.

When encountering problems please report to me first instead of directly
contacting Intel.

Ackknowledgements:
 - Bradley T Hughes <bhughes@trolltech.com> for PR 59552, it resulted in
   a modification of our libc (C++ DSO Object Destruction API) we
   incorporate in the port on < 502101 systems.
 - Marius Strobl <marius@alchemy.franken.de> for his help with the port
   (e.g. ld.c, cxa).
2004-01-11 15:32:07 +00:00
Alexander Leidinger
86837889b7 - use the libc cxa support on a recent -current instead of the hack
NOTE: you need to rebuild stlport-icc and maybe some other C++
         programs/libs.
 - rework ld.c to fix the build of stlport-icc on 4.x (first part
   of the build fix, the second part follows shortly in a stlport
   commit) [1]

Submitted by:	Marius Strobl <marius@alchemy.franken.de> [1]
2003-12-22 15:03:23 +00:00
Alexander Leidinger
18a58e67ad - Update to 7.1.034.
- Modify plist to print a diagnostic instead of a pkg_delete warning
  if there's a license in the license directory.
2003-12-13 13:11:20 +00:00
Alexander Leidinger
8697f3d4a9 s/rpm2cpio/rpm2cpio.pl/ after the recent update of archivers/rpm2cpio (the
script was renamed to solve a conflict with archivers/rpm) to fix possible
build problems.

I've tested this with lang/icc. Any new errors because of this commit in
one of the modified ports may be because the ports previously may have used
rpm2cpio from archivers/rpm instead of the used {EXTRACT,BUILD}_DEPENDS
archivers/rpm2cpio.
2003-12-12 13:43:05 +00:00
Alexander Leidinger
313f5fd733 Update to 7.1.033. 2003-12-08 13:29:42 +00:00
Alexander Leidinger
848d6ca026 correct the syntax of the warning -> error options 2003-11-14 12:23:12 +00:00
Alexander Leidinger
07fe1a29a3 - Update to 7.1.032.
- Transform some warnings into errors as suggested by some included
  docs (some kind of MSVC compatibility which isn't reverted in icc
  for linux).

ld.c:
 - add possibility to use a different threads lib via PTHREAD_LIBS
   variable (e.g. PTHREAD_LIBS=-lthr) [1]
   this may be subject to change when gcc learns how to handle our
   different threads libs
 - refactor some code [1][2]
 - remove mailwrapper license, there's no code from mailwrapper
   anymore [2]
 - correct the order of libc and libc_r [1][2]

Submitted by:	mi [1]
Submitted by:	Marius Strobl <marius@alchemy.franken.de> [2]
Reviewed by:	Marius Strobl <marius@alchemy.franken.de> [1]
2003-11-14 12:09:17 +00:00
Trevor Johnson
bb34de42c0 Use the FIND and XARGS macros introduced in bsd.port.mk 1.391. 2003-11-13 13:30:42 +00:00
Alexander Leidinger
886e12f66c Add a paragraph about Intels support in the post-install message. 2003-11-10 21:32:11 +00:00
Alexander Leidinger
ca836af07e - Fix icc and icpc scripts (variable overriding) [1]
- Don't extract ia64 RPMs [2]
- Fix bug on some 4.7 systems [3]

Noticed by:	mi [1]
Suggested by:	mi [2]
Tested by:	Clint Olsen <clint@0lsen.net>
2003-10-22 13:21:30 +00:00
Alexander Leidinger
aebf0bc438 Update to 7.1.031. 2003-10-21 11:10:23 +00:00
Alexander Leidinger
c9b4723f5a Reword IGNORE text.
Suggested by:	Intel Corporation
2003-10-11 10:59:45 +00:00
Alexander Leidinger
8647e47ef8 Update to 7.1.030. 2003-10-03 12:12:06 +00:00
Alexander Leidinger
d30559b66c Update to 7.1.029. 2003-09-24 12:53:09 +00:00
Alexander Leidinger
18f670da27 Update to 7.1.028. 2003-09-06 10:09:19 +00:00
Alexander Leidinger
df7dde8b41 Fix __sigsetjmp linking problem. 2003-08-22 11:20:38 +00:00
Alexander Leidinger
d3c3508516 - Update to 7.1.027.
- Teach the ld wrapper about /libexec on a recent -current. [1]

Submitted by:	Marius Strobl <marius@alchemy.franken.de> [1]
2003-08-21 14:55:43 +00:00
Alexander Leidinger
daaf1aa22e - Update to 7.1.025.
- Fix spelling of CONFLICTS [1].
- Add request for benchmark numbers [2].

Noticed by:	Andreas Schweitzer <Andreas.Schweitzer@hs.uni-hamburg.de> [1]
Discussed with:	Intel [2]
2003-08-15 13:00:08 +00:00
Alexander Leidinger
97a274bb99 Update to 7.1.021. 2003-07-11 15:48:05 +00:00
Alexander Leidinger
0f48a3a140 Update to 7.1.019. 2003-06-26 13:11:41 +00:00
Alexander Leidinger
29bd595d7c Fix the "make fetch" help string.
Noticed by:	markm
2003-06-15 17:57:26 +00:00
Alexander Leidinger
1636eac6ca Update to 7.1.018. 2003-06-12 10:52:08 +00:00
Alexander Leidinger
fb19333309 Update to 7.1.017. 2003-06-04 18:37:07 +00:00
Alexander Leidinger
bcbf3d5607 Update to 7.1.014. 2003-05-06 15:52:01 +00:00